From 0d9cabaaa71bd7b3ec38ff31f65800ea243fbc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 29 Sep 2022 17:55:59 +0200 Subject: [PATCH 1/3] Revert "Remove the upgrade test from 2.6 to fix the CI" This reverts commit 28d3e4f23b835f82250022b22e54401619636907. --- .github/workflows/main.yaml | 1 + ci/test-upgrade | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e42c454fa4..cf86931fdc 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -189,6 +189,7 @@ jobs: - run: docker images | grep "" | awk '{print $3}' | xargs --no-run-if-empty docker rmi || true - run: ci/test-upgrade init ${HOME}/workspace - run: ci/test-upgrade 240 ${HOME}/workspace + - run: ci/test-upgrade 260 ${HOME}/workspace - run: ci/test-upgrade 27 ${HOME}/workspace - run: ci/test-upgrade cleanup ${HOME}/workspace diff --git a/ci/test-upgrade b/ci/test-upgrade index 94ed400a61..af40105548 100755 --- a/ci/test-upgrade +++ b/ci/test-upgrade @@ -144,7 +144,9 @@ then rm --recursive --force $(find c2cgeoportal/scaffolds -name __pycache__) create-advance ${WORKSPACE}/ref ${MAJOR_VERSION} create ${WORKSPACE}/v27 ${MAJOR_VERSION} + create ${WORKSPACE}/v260 2.6.0 create ${WORKSPACE}/v240 2.4.2.84 + docker rmi camptocamp/geomapfish-tools:2.6.0 docker rmi camptocamp/geomapfish-build:2.4.2.84 cd ${WORKSPACE}/ref/testgeomapfish From c459b6a68a88c1bc90a4a42e50f1a02220a4b245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 4 Oct 2022 17:05:11 +0200 Subject: [PATCH 2/3] Use a more recent version of 2.6 --- ci/test-upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test-upgrade b/ci/test-upgrade index af40105548..476ec98c9d 100755 --- a/ci/test-upgrade +++ b/ci/test-upgrade @@ -144,9 +144,9 @@ then rm --recursive --force $(find c2cgeoportal/scaffolds -name __pycache__) create-advance ${WORKSPACE}/ref ${MAJOR_VERSION} create ${WORKSPACE}/v27 ${MAJOR_VERSION} - create ${WORKSPACE}/v260 2.6.0 + create ${WORKSPACE}/v260 2.6.0.130 create ${WORKSPACE}/v240 2.4.2.84 - docker rmi camptocamp/geomapfish-tools:2.6.0 + docker rmi camptocamp/geomapfish-tools:2.6.0.130 docker rmi camptocamp/geomapfish-build:2.4.2.84 cd ${WORKSPACE}/ref/testgeomapfish From 4470ac3c5ce9b2bc52f26e87d7b21a1f68745cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 5 Oct 2022 09:55:56 +0200 Subject: [PATCH 3/3] Patch the test upgrade --- ci/test-upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test-upgrade b/ci/test-upgrade index 476ec98c9d..c78de42d18 100755 --- a/ci/test-upgrade +++ b/ci/test-upgrade @@ -107,7 +107,7 @@ function upgrade { git add CONST_create_template/geoportal/vars.yaml geoportal/vars.yaml git add CONST_create_template/.github/workflows/main.yaml .github/workflows/main.yaml git add CONST_create_template/docker-compose.yaml docker-compose.yaml - git rm .prospector.yaml geoportal/gunicorn_config.py + git rm .prospector.yaml geoportal/gunicorn_config.py || true git status ./upgrade ${MAJOR_VERSION} 9 fi