From cacd91b126106cf116c8eab62eeafc3c8304fb73 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 4 Oct 2024 09:19:58 +0200 Subject: [PATCH 1/3] Install setuptools It seems the setuptools library is no longer installed by default. Co-Authored-By: @kajinamit --- tox.ini | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index ab72eb5dc..6cc1cb26c 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,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 @@ -72,6 +73,7 @@ deps = # Gnocchi we can't reuse the virtualenv recreate = True setenv = + VIRTUALENV_SETUPTOOLS=bundle GNOCCHI_VERSION_FROM=stable/4.4 GNOCCHI_VARIANT=test,postgresql,file deps = @@ -88,6 +90,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.4 GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib deps = @@ -141,7 +144,9 @@ basepython = python3.9 deps = .[test,file,postgresql,doc] doc8 -setenv = GNOCCHI_TEST_DEBUG=1 +setenv = + VIRTUALENV_SETUPTOOLS=bundle + GNOCCHI_TEST_DEBUG=1 commands = doc8 --ignore-path doc/source/rest.rst,doc/source/comparison-table.rst doc/source pifpaf -g GNOCCHI_INDEXER_URL run postgresql -- python setup.py build_sphinx -W @@ -150,8 +155,10 @@ basepython = python3.9 allowlist_externals = /bin/bash /bin/rm -setenv = GNOCCHI_STORAGE_DEPS=file - GNOCCHI_TEST_DEBUG=1 +setenv = + VIRTUALENV_SETUPTOOLS=bundle + GNOCCHI_STORAGE_DEPS=file + GNOCCHI_TEST_DEBUG=1 install_command = pip install -U {opts} {packages} deps = {[testenv:docs]deps} setuptools From 14978ccc2500f9f1ea62a63de5d7a286c16d006a Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 4 Oct 2024 09:22:36 +0200 Subject: [PATCH 2/3] Switch upgrade test source to 4.5 stable/4.5 is the latest stable release now. Co-Authored-By: @kajinamit --- .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 4bb46541f..d247a7156 100644 --- a/.github/workflows/gnocchi.yml +++ b/.github/workflows/gnocchi.yml @@ -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 @@ -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 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 6cc1cb26c..d0e5e1c26 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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 From 5ac85a46f11e8a421f62e64bbe06139ddee9ffd6 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 4 Oct 2024 13:49:26 +0200 Subject: [PATCH 3/3] image: hack remove distro installed jaraco --- images/Dockerfile.ci | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/Dockerfile.ci b/images/Dockerfile.ci index 433821dc6..dc3e1d262 100644 --- a/images/Dockerfile.ci +++ b/images/Dockerfile.ci @@ -44,8 +44,8 @@ RUN rm -rf /var/lib/apt/lists/* # NOTE(tobias.urdin): hack since pyparsing in site-packages collides with our requirements RUN rm -rf /usr/lib/python3/dist-packages/pyparsing* -# NOTE(tobias.urdin): hack since jaraco.text in site-packages collides with our requirements -RUN rm -rf /usr/lib/python3/dist-packages/jaraco/text* +# NOTE(tobias.urdin): hack since jaracoin site-packages collides with our requirements +RUN rm -rf /usr/lib/python3/dist-packages/jaraco* # TODO(tobias.urdin): hack remove this when we drop python 3.9 RUN sed -i '1s/^/from __future__ import annotations\n/' /usr/lib/python3/dist-packages/werkzeug/sansio/utils.py