Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Remove the upgrade test from 2.6 to fix the CI" #10039

Merged
merged 3 commits into from
Oct 5, 2022
Merged

Revert "Remove the upgrade test from 2.6 to fix the CI" #10039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d9caba
Revert "Remove the upgrade test from 2.6 to fix the CI"
sbrunner Sep 29, 2022
c459b6a
Use a more recent version of 2.6
sbrunner Oct 4, 2022
4470ac3
Patch the test upgrade
sbrunner Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ jobs:
- run: docker images | grep "<none>" | 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

Expand Down
4 changes: 3 additions & 1 deletion ci/test-upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.130
create ${WORKSPACE}/v240 2.4.2.84
docker rmi camptocamp/geomapfish-tools:2.6.0.130
docker rmi camptocamp/geomapfish-build:2.4.2.84

cd ${WORKSPACE}/ref/testgeomapfish
Expand Down