Fix the upgrade after mako interpretation

camptocamp · May 15, 2019 · b277103 · b277103
1 parent b5a4e5e
commit b277103
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/+dot+upgrade.yaml_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/update/+dot+upgrade.yaml_tmpl
@@ -14,7 +14,7 @@ default_project_file:
     - geoportal/{{package}}_geoportal/jsbuild/.*
     - print/print-apps/.*
     - mapserver/.*
-    - tilegeneration/config\.yaml\.tmpl\.mako
+    - tilegeneration/config\.yaml\.tmpl
     - project\.yaml\.mako
     - docker-compose\.yaml
     - \.env\.mako
@@ -24,7 +24,7 @@ default_project_file:
     - README\.rst
   exclude:
     - geoportal/{{package}}_geoportal/static-ngeo/js/{{package}}module\.js
-    - mapserver/demo\.map\.tmpl\.mako
+    - mapserver/demo\.map\.tmpl
 
 no_diff:
   - .*\.po

diff --git a/travis/test-upgrade-convert.sh b/travis/test-upgrade-convert.sh
@@ -230,6 +230,8 @@ function v220 {
         cp CONST_create_template/.env.mako .
         ./docker-run make --always-make --makefile=CONST_convert2tmpl.mk to-tmpl
         cp CONST_create_template/mapserver/*.tmpl mapserver
+        mkdir -p tilegeneration
+        cp CONST_create_template/tilegeneration/config.yaml.tmpl tilegeneration/
     fi
     cp CONST_create_template/mapserver/data/Readme.txt mapserver/data/
 
@@ -289,6 +291,7 @@ function v230 {
         then
             cp CONST_create_template/docker-compose.yaml .
             cp CONST_create_template/.env.mako .
+            cp CONST_create_template/tilegeneration/config.yaml.tmpl tilegeneration/
         else
             cp CONST_create_template/mapserver/data/Readme.txt mapserver/data/
         fi