Skip to content

Commit

Permalink
Switch upgrade test source to 4.5
Browse files Browse the repository at this point in the history
stable/4.5 is the latest stable release now.

Co-Authored-By: @kajinamit
  • Loading branch information
tobias-urdin committed Oct 4, 2024
1 parent cacd91b commit 14978cc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/gnocchi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ jobs:
- py39
- py311
env:
- mysql-ceph-upgrade-from-4.4
- postgresql-file-upgrade-from-4.4
- mysql-ceph-upgrade-from-4.5
- postgresql-file-upgrade-from-4.5
- mysql-file
- mysql-file-sqlalchemy14
- mysql-swift
Expand All @@ -124,13 +124,13 @@ jobs:
- postgresql-s3
- postgresql-ceph
exclude:
- env: mysql-ceph-upgrade-from-4.4
- env: mysql-ceph-upgrade-from-4.5
python: py39
- env: mysql-ceph
python: py39
- env: postgresql-ceph
python: py39
- env: mysql-ceph-upgrade-from-4.4
- env: mysql-ceph-upgrade-from-4.5
python: py311
- env: mysql-ceph
python: py311
Expand Down
18 changes: 9 additions & 9 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ queue_rules:
- check-success=doc (docs-gnocchi-web)
- check-success=check (build)
- check-success=check (pep8)
- check-success=test (py39, mysql-ceph-upgrade-from-4.4)
- check-success=test (py39, postgresql-file-upgrade-from-4.4)
- check-success=test (py39, mysql-ceph-upgrade-from-4.5)
- check-success=test (py39, postgresql-file-upgrade-from-4.5)
- check-success=test (py39, mysql-file)
- check-success=test (py39, mysql-file-sqlalchemy14)
- check-success=test (py39, mysql-swift)
Expand All @@ -17,7 +17,7 @@ queue_rules:
- check-success=test (py39, postgresql-swift)
- check-success=test (py39, postgresql-s3)
- check-success=test (py39, postgresql-ceph)
- check-success=test (py311, postgresql-file-upgrade-from-4.4)
- check-success=test (py311, postgresql-file-upgrade-from-4.5)
- check-success=test (py311, mysql-file)
- check-success=test (py311, mysql-file-sqlalchemy14)
- check-success=test (py311, mysql-swift)
Expand All @@ -40,8 +40,8 @@ pull_request_rules:
- check-success=doc (docs-gnocchi-web)
- check-success=check (build)
- check-success=check (pep8)
- check-success=test (py39, mysql-ceph-upgrade-from-4.4)
- check-success=test (py39, postgresql-file-upgrade-from-4.4)
- check-success=test (py39, mysql-ceph-upgrade-from-4.5)
- check-success=test (py39, postgresql-file-upgrade-from-4.5)
- check-success=test (py39, mysql-file)
- check-success=test (py39, mysql-file-sqlalchemy14)
- check-success=test (py39, mysql-swift)
Expand All @@ -52,7 +52,7 @@ pull_request_rules:
- check-success=test (py39, postgresql-swift)
- check-success=test (py39, postgresql-s3)
- check-success=test (py39, postgresql-ceph)
- check-success=test (py311, postgresql-file-upgrade-from-4.4)
- check-success=test (py311, postgresql-file-upgrade-from-4.5)
- check-success=test (py311, mysql-file)
- check-success=test (py311, mysql-file-sqlalchemy14)
- check-success=test (py311, mysql-swift)
Expand Down Expand Up @@ -81,10 +81,10 @@ pull_request_rules:
- actions:
backport:
branches:
- stable/4.4
- stable/4.5
conditions:
- label=backport-to-4.4
name: backport stable/4.4
- label=backport-to-4.5
name: backport stable/4.5

- actions:
backport:
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ deps =
{[testenv]deps}
sqlalchemy<2

[testenv:{py39,py311}-postgresql-file-upgrade-from-4.4]
[testenv:{py39,py311}-postgresql-file-upgrade-from-4.5]
# We should always recreate since the script upgrade
# Gnocchi we can't reuse the virtualenv
recreate = True
setenv =
VIRTUALENV_SETUPTOOLS=bundle
GNOCCHI_VERSION_FROM=stable/4.4
GNOCCHI_VERSION_FROM=stable/4.5
GNOCCHI_VARIANT=test,postgresql,file
deps =
# TODO(tobias-urdin): Remove this pin and use pifpaf directly instead when this is
Expand All @@ -85,13 +85,13 @@ deps =
commands = {toxinidir}/run-upgrade-tests.sh postgresql-file
allowlist_externals = {toxinidir}/run-upgrade-tests.sh

[testenv:{py39,py311}-mysql-ceph-upgrade-from-4.4]
[testenv:{py39,py311}-mysql-ceph-upgrade-from-4.5]
# We should always recreate since the script upgrade
# Gnocchi we can't reuse the virtualenv
recreate = True
setenv =
VIRTUALENV_SETUPTOOLS=bundle
GNOCCHI_VERSION_FROM=stable/4.4
GNOCCHI_VERSION_FROM=stable/4.5
GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib
deps =
# TODO(tobias-urdin): Remove this pin and use pifpaf directly instead when this is
Expand Down

0 comments on commit 14978cc

Please sign in to comment.