From 05398ded7a902389323648ced9ef25c4bfe13882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 24 May 2018 12:07:10 +0200 Subject: [PATCH] Add upgrade tests form 2.3 --- Jenkinsfile | 247 +++++++++--------- travis/from23-config | 3 + travis/{v22-project.yaml => old-project.yaml} | 9 +- travis/test-upgrade-convert.sh | 98 +++++-- travis/{v23-project.yaml => v24-project.yaml} | 0 5 files changed, 216 insertions(+), 141 deletions(-) create mode 100644 travis/from23-config rename travis/{v22-project.yaml => old-project.yaml} (91%) rename travis/{v23-project.yaml => v24-project.yaml} (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 5f68235fdf..e353c26ca7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,148 +34,157 @@ dockerBuild { clean() } stage('Build') { + checkout scm sh 'make docker-build' + sh 'docker run --name geomapfish-db --env=POSTGRES_USER=www-data --env=POSTGRES_PASSWORD=www-data --env=POSTGRES_DB=geomapfish --publish=5432:5432 --detach camptocamp/geomapfish-test-db' + sh 'travis/test-upgrade-convert.sh init ${HOME}/workspace' } - parallel 'Lint and test c2cgeoportal': { - sh './docker-run travis/status.sh' - sh './docker-run travis/empty-make help' - sh 'bash -c "test \\"`./docker-run id`\\" == \\"uid=0(root) gid=0(root) groups=0(root)\\""' - sh './docker-run travis/short-make build' - sh './docker-run make doc' - // lint - sh './docker-run make checks' - sh './docker-run travis/status.sh' - // Test return code - sh './docker-run true' - sh 'if ./docker-run false; then false; fi' - try { - sh './docker-compose-run true' - sh 'if ./docker-compose-run false; then false; fi' - } catch (Exception error) { - sh 'docker-compose logs' - throw error - } finally { - sh 'docker-compose down' - } + stage('Test') { + checkout scm + parallel 'Lint and test c2cgeoportal': { + sh './docker-run travis/status.sh' + sh './docker-run travis/empty-make help' + sh 'bash -c "test \\"`./docker-run id`\\" == \\"uid=0(root) gid=0(root) groups=0(root)\\""' + sh './docker-run travis/short-make build' + sh './docker-run make doc' + // lint + sh './docker-run make checks' + sh './docker-run travis/status.sh' + // Test return code + sh './docker-run true' + sh 'if ./docker-run false; then false; fi' + try { + sh './docker-compose-run true' + sh 'if ./docker-compose-run false; then false; fi' + } catch (Exception error) { + sh 'docker-compose logs' + throw error + } finally { + sh 'docker-compose down' + } - sh './docker-run make prepare-tests' - sh './docker-run travis/status.sh' - try { - sh './docker-compose-run alembic --config=geoportal/tests/functional/alembic.ini --name=main upgrade head' - sh './docker-compose-run alembic --config=geoportal/tests/functional/alembic.ini --name=static upgrade head' - sh './docker-compose-run make tests' - } catch (Exception error) { - sh 'docker-compose logs' - throw error - } finally { - sh 'docker-compose down' - } - sh './docker-run travis/codacy.sh' - sh './docker-run travis/status.sh' - }, 'Test Docker app': { - sh 'rm -rf ${HOME}/workspace/testgeomapfish' - sh 'docker build --tag=camptocamp/testgeomapfish-external-db:latest docker/test-external-db' - try { - sh 'travis/create-new-project.sh ${HOME}/workspace' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run make update-po)' - } catch (Exception error) { - sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose --file=docker-compose-build.yaml logs)' - throw error - } finally { - // down will lost the default theme - sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose --file=docker-compose-build.yaml stop)' - } - // Commit the l10n files modifications - // To prevent fail on modification files check - sh '(cd ${HOME}/workspace/testgeomapfish/; git add geoportal/testgeomapfish_geoportal/locale/*/LC_MESSAGES/testgeomapfish_geoportal-*.po)' - sh '(cd ${HOME}/workspace/testgeomapfish/; git commit -m "Upgrade the po files")' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run travis/empty-make --makefile=travis.mk help)' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run make --makefile=travis.mk build)' - sh 'cat ${HOME}/workspace/testgeomapfish/testdb/*.sql' - sh 'cat ${HOME}/workspace/testgeomapfish/geoportal/config.yaml' - withCredentials([[ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'dockerhub', - usernameVariable: 'USERNAME', - passwordVariable: 'PASSWORD' - ]]) { + sh './docker-run make prepare-tests' + sh './docker-run travis/status.sh' try { - sh 'docker login -u "$USERNAME" -p "$PASSWORD"' - sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose up --force-recreate -d)' - sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose exec -T geoportal wait-for-db)' - sh './docker-run travis/waitwsgi http://`netstat --route --numeric|grep ^0.0.0.0|awk \'{print($2)}\'`:8080/' - for (path in [ - 'c2c/health_check', - 'c2c/health_check?max_level=9', - 'c2c/health_check?checks=check_collector', - 'layers/test/values/type enum', - 'admin/layertree', - 'admin/layertree/children' - ]) { - def start_lines = [:] - ['db', 'external-db', 'print', 'mapserver', 'geoportal'].each { service -> - def start_line = sh(returnStdout: true, script: "(cd ${HOME}/workspace/testgeomapfish/; docker-compose logs ${service}) | wc -l") as Integer - start_lines.service = start_line - } - try { - sh 'travis/test-new-project http://`netstat --route --numeric|grep ^0.0.0.0|awk \'{print($2)}\'`:8080/' + path - } catch (Exception error) { + sh './docker-compose-run alembic --config=geoportal/tests/functional/alembic.ini --name=main upgrade head' + sh './docker-compose-run alembic --config=geoportal/tests/functional/alembic.ini --name=static upgrade head' + sh './docker-compose-run make tests' + } catch (Exception error) { + sh 'docker-compose logs' + throw error + } finally { + sh 'docker-compose down' + } + sh './docker-run travis/codacy.sh' + sh './docker-run travis/status.sh' + }, 'Test Docker app': { + sh 'rm -rf ${HOME}/workspace/testgeomapfish' + sh 'docker build --tag=camptocamp/testgeomapfish-external-db:latest docker/test-external-db' + try { + sh 'travis/create-new-project.sh ${HOME}/workspace' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run make update-po)' + } catch (Exception error) { + sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose --file=docker-compose-build.yaml logs)' + throw error + } finally { + // down will lost the default theme + sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose --file=docker-compose-build.yaml stop)' + } + // Commit the l10n files modifications + // To prevent fail on modification files check + sh '(cd ${HOME}/workspace/testgeomapfish/; git add geoportal/testgeomapfish_geoportal/locale/*/LC_MESSAGES/testgeomapfish_geoportal-*.po)' + sh '(cd ${HOME}/workspace/testgeomapfish/; git commit -m "Upgrade the po files")' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run travis/empty-make --makefile=travis.mk help)' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run make --makefile=travis.mk build)' + sh 'cat ${HOME}/workspace/testgeomapfish/testdb/*.sql' + sh 'cat ${HOME}/workspace/testgeomapfish/geoportal/config.yaml' + withCredentials([[ + $class : 'UsernamePasswordMultiBinding', + credentialsId : 'dockerhub', + usernameVariable: 'USERNAME', + passwordVariable: 'PASSWORD' + ]]) { + try { + sh 'docker login -u "$USERNAME" -p "$PASSWORD"' + sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose up --force-recreate -d)' + sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose exec -T geoportal wait-for-db)' + sh './docker-run travis/waitwsgi http://`netstat --route --numeric|grep ^0.0.0.0|awk \'{print($2)}\'`:8080/' + for (path in [ + 'c2c/health_check', + 'c2c/health_check?max_level=9', + 'c2c/health_check?checks=check_collector', + 'layers/test/values/type enum', + 'admin/layertree', + 'admin/layertree/children' + ]) { + def start_lines = [:] ['db', 'external-db', 'print', 'mapserver', 'geoportal'].each { service -> - def end_line = sh(returnStdout: true, script: "(cd ${HOME}/workspace/testgeomapfish/; docker-compose logs ${service}) | wc -l") as Integer - sh "(cd ${HOME}/workspace/testgeomapfish/; docker-compose logs --timestamps --tail=${Math.max(1, end_line - start_lines.service)} ${service})" + def start_line = sh(returnStdout: true, script: "(cd ${HOME}/workspace/testgeomapfish/; docker-compose logs ${service}) | wc -l") as Integer + start_lines.service = start_line + } + try { + sh 'travis/test-new-project http://`netstat --route --numeric|grep ^0.0.0.0|awk \'{print($2)}\'`:8080/' + path + } catch (Exception error) { + ['db', 'external-db', 'print', 'mapserver', 'geoportal'].each { service -> + def end_line = sh(returnStdout: true, script: "(cd ${HOME}/workspace/testgeomapfish/; docker-compose logs ${service}) | wc -l") as Integer + sh "(cd ${HOME}/workspace/testgeomapfish/; docker-compose logs --timestamps --tail=${Math.max(1, end_line - start_lines.service)} ${service})" + } + throw error } - throw error } + } catch (Exception error) { + sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose logs --timestamps)' + throw error + } finally { + sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose down)' } + } + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run travis/short-make --makefile=travis.mk build)' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run make --makefile=travis.mk checks)' + sh '''find \ + ${HOME}/workspace/testgeomapfish/geoportal/setup.py \ + ${HOME}/workspace/testgeomapfish/geoportal/testgeomapfish_geoportal/*.py \ + ${HOME}/workspace/testgeomapfish/geoportal/testgeomapfish_geoportal/views \ + ${HOME}/workspace/testgeomapfish/commons/setup.py \ + ${HOME}/workspace/testgeomapfish/commons/testgeomapfish_commons \ + -name \\*.py | xargs travis/squote''' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run travis/status.sh)' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run make --makefile=empty-vars.mk geoportal/config.yaml)' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run make --makefile=travis.mk alembic.ini)' + try { + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run alembic --name=main upgrade head)' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run alembic --name=static upgrade head)' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run alembic --name=static downgrade base)' + sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run alembic --name=main downgrade base)' } catch (Exception error) { - sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose logs --timestamps)' + sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose --file=docker-compose-build.yaml logs)' throw error } finally { - sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose down)' + sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose --file=docker-compose-build.yaml down)' } - } - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run travis/short-make --makefile=travis.mk build)' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run make --makefile=travis.mk checks)' - sh '''find \ - ${HOME}/workspace/testgeomapfish/geoportal/setup.py \ - ${HOME}/workspace/testgeomapfish/geoportal/testgeomapfish_geoportal/*.py \ - ${HOME}/workspace/testgeomapfish/geoportal/testgeomapfish_geoportal/views \ - ${HOME}/workspace/testgeomapfish/commons/setup.py \ - ${HOME}/workspace/testgeomapfish/commons/testgeomapfish_commons \ - -name \\*.py | xargs travis/squote''' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run travis/status.sh)' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run make --makefile=empty-vars.mk geoportal/config.yaml)' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-run make --makefile=travis.mk alembic.ini)' - try { - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run alembic --name=main upgrade head)' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run alembic --name=static upgrade head)' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run alembic --name=static downgrade base)' - sh '(cd ${HOME}/workspace/testgeomapfish/; ./docker-compose-run alembic --name=main downgrade base)' - } catch (Exception error) { - sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose --file=docker-compose-build.yaml logs)' - throw error - } finally { - sh '(cd ${HOME}/workspace/testgeomapfish/; docker-compose --file=docker-compose-build.yaml down)' - } - sh 'rm -rf ${HOME}/workspace/testgeomapfish' - }, 'Tests upgrades': { - try { - sh 'docker run --name geomapfish-db --env=POSTGRES_USER=www-data --env=POSTGRES_PASSWORD=www-data --env=POSTGRES_DB=geomapfish --publish=5432:5432 --detach camptocamp/geomapfish-test-db' - sh 'travis/test-upgrade-convert.sh init ${HOME}/workspace' + sh 'rm -rf ${HOME}/workspace/testgeomapfish' + }, 'Tests upgrades 220': { // Test Upgrade an convert project sh 'travis/test-upgrade-convert.sh v220-todocker ${HOME}/workspace' sh 'travis/test-upgrade-convert.sh v220-tonondocker ${HOME}/workspace' + } + } + stage('Test Upgrade') { + parallel 'Tests upgrades Docker': { sh 'travis/test-upgrade-convert.sh docker ${HOME}/workspace' sh 'travis/test-upgrade-convert.sh tonondocker ${HOME}/workspace' + }, 'Tests upgrades non Docker': { sh 'travis/test-upgrade-convert.sh nondocker ${HOME}/workspace' sh 'travis/test-upgrade-convert.sh todocker ${HOME}/workspace' - } finally { - sh 'docker stop geomapfish-db' - sh 'docker rm --volumes geomapfish-db' + }, 'Tests upgrades 230': { + sh 'travis/test-upgrade-convert.sh v230-docker ${HOME}/workspace' + sh 'travis/test-upgrade-convert.sh v230-nondocker ${HOME}/workspace' } } } finally { stage('Clean') { + sh 'docker stop geomapfish-db' + sh 'docker rm --volumes geomapfish-db' clean() } } diff --git a/travis/from23-config b/travis/from23-config new file mode 100644 index 0000000000..de6e54e45d --- /dev/null +++ b/travis/from23-config @@ -0,0 +1,3 @@ +[docker-run] +image=camptocamp/geomapfish-build +version=2.4 diff --git a/travis/v22-project.yaml b/travis/old-project.yaml similarity index 91% rename from travis/v22-project.yaml rename to travis/old-project.yaml index cfd14ee7b1..c7167c1db4 100644 --- a/travis/v22-project.yaml +++ b/travis/old-project.yaml @@ -1,8 +1,9 @@ --- project_folder: testgeomapfish project_package: ${package} -host: ${host} -checker_path: /${instanceid}/wsgi/check_collector? +checker_url: http://localhost/c2c/health_check? +checker_headers: + Host: ${host} managed_files: [] unmanaged_files: - \.gitignore @@ -19,8 +20,8 @@ unmanaged_files: - mapserver/mapserver\.map\.tmpl\.mako - print/print-apps/testgeomapfish/config\.yaml\.mako - print/print-apps/testgeomapfish/.*\.jrxml - - geoportal/testgeomapfish_geoportal/locale/fr/LC_MESSAGES/testgeomapfish-client\.po - - geoportal/testgeomapfish_geoportal/locale/de/LC_MESSAGES/testgeomapfish-client\.po + - geoportal/testgeomapfish_geoportal/locale/fr/LC_MESSAGES/testgeomapfish_geoportal-client\.po + - geoportal/testgeomapfish_geoportal/locale/de/LC_MESSAGES/testgeomapfish_geoportal-client\.po - geoportal/testgeomapfish_geoportal/static-ngeo/js/apps/desktop\.html\.ejs - geoportal/testgeomapfish_geoportal/static-ngeo/js/apps/mobile\.html\.ejs - geoportal/testgeomapfish_geoportal/static-ngeo/js/apps/Controllerdesktop\.js diff --git a/travis/test-upgrade-convert.sh b/travis/test-upgrade-convert.sh index 829553cb9a..df9237c275 100755 --- a/travis/test-upgrade-convert.sh +++ b/travis/test-upgrade-convert.sh @@ -5,15 +5,15 @@ WORKSPACE=$2 export NODE_ENV=development function pcreate { - ./docker-run --image=camptocamp/geomapfish-build --share $1 pcreate --scaffold=$2 $1/testgeomapfish \ + ./docker-run --image=camptocamp/geomapfish-build $3 --share $1 pcreate --scaffold=$2 $1/testgeomapfish \ --overwrite --ignore-conflicting-name --package-name testgeomapfish } function only_create { rm --recursive --force $1 mkdir --parent $1 - pcreate $1 c2cgeoportal_create - pcreate $1 c2cgeoportal_update + pcreate $1 c2cgeoportal_create $2 + pcreate $1 c2cgeoportal_update $2 cd $1/testgeomapfish git init git config user.email travis@camptocamp.com @@ -23,7 +23,7 @@ function only_create { } function create { - only_create $1 + only_create $1 $2 cd $1/testgeomapfish git add --all git commit --quiet --message="Initial commit" @@ -32,9 +32,9 @@ function create { } function createnondocker { - only_create $1 - pcreate $1 c2cgeoportal_nondockercreate - pcreate $1 c2cgeoportal_nondockerupdate + only_create $1 $2 + pcreate $1 c2cgeoportal_nondockercreate $2 + pcreate $1 c2cgeoportal_nondockerupdate $2 cd $1/testgeomapfish git add --all git commit --quiet --message="Initial commit" @@ -56,6 +56,14 @@ function createv220 { cd - } +function printdiff { + for f in $(ls -1 *.diff) + do + echo "--- $f ---" + cat "$f" + done +} + if [ "$1" = "init" ] then rm --recursive --force ${WORKSPACE}/nondockerref ${WORKSPACE}/dockerref \ @@ -68,6 +76,8 @@ then create ${WORKSPACE}/dockerref createnondocker ${WORKSPACE}/nondocker createnondocker ${WORKSPACE}/nondockerref + create ${WORKSPACE}/v230-docker --version=2.3.0 + createnondocker ${WORKSPACE}/v230-nondocker --version=2.3.0 unset SRID APACHE_VHOST EXTENT mkdir --parent ${WORKSPACE}/v220 ./docker-run --share=${WORKSPACE} tar --extract --bzip2 --file=travis/v220.tar.bz2 --directory=${WORKSPACE}/v220 @@ -81,6 +91,7 @@ then ./docker-run --env=NODE_ENV make upgrade if [ ! -e .UPGRADE_SUCCESS ] then + printdiff echo "Fail to upgrade" exit 1 fi @@ -98,6 +109,7 @@ then ./docker-run --env=NODE_ENV make --makefile=testgeomapfish.mk upgrade if [ ! -e .UPGRADE_SUCCESS ] then + printdiff echo "Fail to upgrade" exit 1 fi @@ -111,16 +123,17 @@ fi if [ "$1" = "todocker" ] then - cp travis/v23-project.yaml ${WORKSPACE}/nondocker/testgeomapfish/project.yaml.mako + cp travis/v24-project.yaml ${WORKSPACE}/nondocker/testgeomapfish/project.yaml.mako cd ${WORKSPACE}/nondocker/testgeomapfish echo "UPGRADE_ARGS += --force-docker --new-makefile=Makefile" > temp.mk cat testgeomapfish.mk >> temp.mk git rm testgeomapfish.mk git add temp.mk project.yaml.mako git commit --quiet --message="Start upgrade" - ./docker-run make --makefile=temp.mk upgrade + ./docker-run --env=NODE_ENV make --makefile=temp.mk upgrade if [ ! -e .UPGRADE10 ] then + printdiff echo "Fail to upgrade" exit 1 fi @@ -131,6 +144,7 @@ then ./docker-run --env=NODE_ENV make upgrade11 if [ ! -e .UPGRADE_SUCCESS ] then + printdiff echo "Fail to upgrade" exit 1 fi @@ -145,7 +159,7 @@ fi if [ "$1" = "tonondocker" ] then - cp travis/v23-project.yaml ${WORKSPACE}/docker/testgeomapfish/project.yaml.mako + cp travis/v24-project.yaml ${WORKSPACE}/docker/testgeomapfish/project.yaml.mako cd ${WORKSPACE}/docker/testgeomapfish cp Makefile tmp echo "UPGRADE_ARGS += --nondocker --new-makefile=testgeomapfish.mk" > Makefile @@ -157,6 +171,7 @@ then ./docker-run --env=NODE_ENV make upgrade if [ ! -e .UPGRADE10 ] then + printdiff echo "Fail to upgrade" exit 1 fi @@ -168,6 +183,7 @@ then ./docker-run --env=NODE_ENV make --makefile=testgeomapfish.mk upgrade11 if [ ! -e .UPGRADE_SUCCESS ] then + printdiff echo "Fail to upgrade" exit 1 fi @@ -181,7 +197,7 @@ fi function v220 { cp docker-run $1/testgeomapfish - cp travis/v22-project.yaml $1/testgeomapfish/project.yaml.mako + cp travis/old-project.yaml $1/testgeomapfish/project.yaml.mako cd $1/testgeomapfish head --lines=-23 CONST_vars.yaml > CONST_vars.yaml_ mv CONST_vars.yaml{_,} @@ -200,20 +216,17 @@ function v220 { fi if [ ! -e .UPGRADE8 ] then + printdiff echo "Fail to upgrade" exit 1 fi mv geoportal/testgeomapfish_geoportal/locale/en/LC_MESSAGES/testgeomapfish{,_geoportal}-client.po mv geoportal/testgeomapfish_geoportal/locale/fr/LC_MESSAGES/testgeomapfish{,_geoportal}-client.po mv geoportal/testgeomapfish_geoportal/locale/de/LC_MESSAGES/testgeomapfish{,_geoportal}-client.po - ./docker-run make $MAKE_ARGS upgrade9 + ./docker-run --env=NODE_ENV make $MAKE_ARGS upgrade9 if [ ! -e .UPGRADE_SUCCESS ] then - for f in $(ls -1 *.diff) - do - echo "--- $f ---" - cat "$f" - done + printdiff echo "Fail to upgrade" exit 1 fi @@ -235,9 +248,58 @@ then v220 ${WORKSPACE}/v220-tonondocker non fi + +if [ "$1" = "v230-docker" ] +then + cp travis/old-project.yaml ${WORKSPACE}/v230-docker/testgeomapfish/project.yaml.mako + cp travis/from23-config ${WORKSPACE}/v230-docker/testgeomapfish/.config + cd ${WORKSPACE}/v230-docker/testgeomapfish + git add project.yaml.mako .config + git commit --quiet --message="Start upgrade" + ./docker-run --env=NODE_ENV make upgrade + if [ ! -e .UPGRADE_SUCCESS ] + then + printdiff + echo "Fail to upgrade" + exit 1 + fi + ./docker-run make clean-all + rm --recursive --force .UPGRADE* \ + commons/testgeomapfish_commons.egg-info geoportal/testgeomapfish_geoportal.egg-info + cd - + find ${WORKSPACE}/v230-docker -type d -empty -delete + diff --recursive --exclude=.git ${WORKSPACE}/dockerref ${WORKSPACE}/v230-docker +fi + +if [ "$1" = "v230-nondocker" ] +then + cp travis/old-project.yaml ${WORKSPACE}/v230-nondocker/testgeomapfish/project.yaml.mako + cp travis/from23-config ${WORKSPACE}/v230-nondocker/testgeomapfish/.config + cd ${WORKSPACE}/v230-nondocker/testgeomapfish + echo "UPGRADE_ARGS += --force-docker --new-makefile=Makefile" > temp.mk + cat testgeomapfish.mk >> temp.mk + git rm testgeomapfish.mk + git add project.yaml.mako .config temp.mk + git commit --quiet --message="Start upgrade" + ./docker-run --env=NODE_ENV make --makefile=temp.mk upgrade + if [ ! -e .UPGRADE_SUCCESS ] + then + echo "Fail to upgrade" + exit 1 + fi + git rm temp.mk + ./docker-run make clean-all + rm --recursive --force .UPGRADE* \ + commons/testgeomapfish_commons.egg-info geoportal/testgeomapfish_geoportal.egg-info + cd - + find ${WORKSPACE}/v230-nondocker -type d -empty -delete + diff --recursive --exclude=.git ${WORKSPACE}/dockerref ${WORKSPACE}/v230-nondocker +fi + if [ "$1" = "cleanup" ] then rm --recursive --force ${WORKSPACE}/nondockerref ${WORKSPACE}/dockerref \ ${WORKSPACE}/nondocker ${WORKSPACE}/docker \ - ${WORKSPACE}/v220-todocker ${WORKSPACE}/v220-tonondocker + ${WORKSPACE}/v220-todocker ${WORKSPACE}/v220-tonondocker \ + ${WORKSPACE}/v230-docker ${WORKSPACE}/v230-nondocker fi diff --git a/travis/v23-project.yaml b/travis/v24-project.yaml similarity index 100% rename from travis/v23-project.yaml rename to travis/v24-project.yaml