From 560cae6998720c83a80b430beb19f8efc39ab984 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 3 Oct 2024 20:10:38 +0900 Subject: [PATCH 1/3] Continue jobs after failure We may need to check all jobs even if a few of these fail. --- .github/workflows/gnocchi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gnocchi.yml b/.github/workflows/gnocchi.yml index 43f394b2b..250aaeee7 100644 --- a/.github/workflows/gnocchi.yml +++ b/.github/workflows/gnocchi.yml @@ -106,6 +106,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 strategy: + fail-fast: false matrix: python: - py39 From aba4979ed72ffc56736015878bad22a8dab26f1f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 3 Oct 2024 20:14:55 +0900 Subject: [PATCH 2/3] Switch upgrade test source to 4.5 stable/4.5 is the latest stable release now. --- .github/workflows/gnocchi.yml | 8 ++++---- .mergify.yml | 18 +++++++++--------- tox.ini | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/gnocchi.yml b/.github/workflows/gnocchi.yml index 250aaeee7..378ab7613 100644 --- a/.github/workflows/gnocchi.yml +++ b/.github/workflows/gnocchi.yml @@ -112,8 +112,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 @@ -125,13 +125,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 diff --git a/.mergify.yml b/.mergify.yml index 139e5d37f..d0e91b6e1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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) @@ -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) @@ -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) @@ -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) @@ -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: diff --git a/tox.ini b/tox.ini index e4b66d270..0f81ee4d6 100644 --- a/tox.ini +++ b/tox.ini @@ -63,12 +63,12 @@ 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 = - GNOCCHI_VERSION_FROM=stable/4.4 + GNOCCHI_VERSION_FROM=stable/4.5 GNOCCHI_VARIANT=test,postgresql,file deps = gnocchiclient>=2.8.0,!=7.0.7 @@ -77,12 +77,12 @@ 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 = - GNOCCHI_VERSION_FROM=stable/4.4 + GNOCCHI_VERSION_FROM=stable/4.5 GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib deps = gnocchiclient>=2.8.0,!=7.0.7 From ba51fda5a568f0166e967aa84432cc806ab41fc3 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 3 Oct 2024 19:39:27 +0900 Subject: [PATCH 3/3] Install setuptools It seems the setuptools library is no longer installed by default. --- tox.ini | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 0f81ee4d6..55ccf5337 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ passenv = GNOCCHI_TEST_* AWS_* setenv = + VIRTUALENV_SETUPTOOLS=bundle GNOCCHI_TEST_STORAGE_DRIVER=file GNOCCHI_TEST_INDEXER_DRIVER=postgresql GNOCCHI_TEST_STORAGE_DRIVERS=file swift ceph s3 redis @@ -69,6 +70,7 @@ deps = recreate = True setenv = GNOCCHI_VERSION_FROM=stable/4.5 + VIRTUALENV_SETUPTOOLS=bundle GNOCCHI_VARIANT=test,postgresql,file deps = gnocchiclient>=2.8.0,!=7.0.7 @@ -82,6 +84,7 @@ allowlist_externals = {toxinidir}/run-upgrade-tests.sh # Gnocchi we can't reuse the virtualenv recreate = True setenv = + VIRTUALENV_SETUPTOOLS=bundle GNOCCHI_VERSION_FROM=stable/4.5 GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib deps = @@ -103,6 +106,7 @@ allowlist_externals = [testenv:{py39,py311}-cover] setenv = + VIRTUALENV_SETUPTOOLS=bundle {[testenv]setenv} PYTHON=coverage run --source gnocchi --parallel-mode commands = @@ -131,6 +135,7 @@ deps = .[test,file,postgresql,doc] doc8 setenv = + VIRTUALENV_SETUPTOOLS=bundle GNOCCHI_TEST_DEBUG=1 commands = doc8 --ignore-path doc/source/rest.rst,doc/source/comparison-table.rst doc/source @@ -141,11 +146,11 @@ allowlist_externals = /bin/bash /bin/rm setenv = + VIRTUALENV_SETUPTOOLS=bundle GNOCCHI_STORAGE_DEPS=file GNOCCHI_TEST_DEBUG=1 deps = {[testenv:docs]deps} - setuptools commands = /bin/rm -rf doc/build/html pifpaf -g GNOCCHI_INDEXER_URL run postgresql -- sphinx-build -W --keep-going -b html -j auto doc/source doc/build/html