Merge pull request #1419 from tobias-urdin/46-fix-ci

Fix CI for stable/4.6

.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

.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:

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

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
@@ -67,12 +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 =
-  GNOCCHI_VERSION_FROM=stable/4.4
+  VIRTUALENV_SETUPTOOLS=bundle
+  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
@@ -83,12 +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 =
-  GNOCCHI_VERSION_FROM=stable/4.4
+  VIRTUALENV_SETUPTOOLS=bundle
+  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
@@ -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