From ba83a49d2f8043613d8fcc13c05aa2ed5c9910a6 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.com>
Date: Mon, 7 Oct 2024 08:59:23 +0200
Subject: [PATCH] Test Python 3.12 on Ubuntu 24.04 LTS

---
 .github/workflows/gnocchi.yml |  1 +
 .mergify.yml                  | 24 ++++++++++++++++++++++++
 images/Dockerfile.ci          |  2 +-
 tox.ini                       | 10 +++++-----
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gnocchi.yml b/.github/workflows/gnocchi.yml
index 43406e32d..2afa8091f 100644
--- a/.github/workflows/gnocchi.yml
+++ b/.github/workflows/gnocchi.yml
@@ -110,6 +110,7 @@ jobs:
         python:
           - py39
           - py311
+          - py312
         env:
           - mysql-ceph-upgrade-from-4.5
           - postgresql-file-upgrade-from-4.5
diff --git a/.mergify.yml b/.mergify.yml
index d831689a8..f1cb4bbf1 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -26,6 +26,18 @@ queue_rules:
     - check-success=test (py311, postgresql-file-sqlalchemy14)
     - check-success=test (py311, postgresql-swift)
     - check-success=test (py311, postgresql-s3)
+    - check-success=test (py312, mysql-ceph-upgrade-from-4.5)
+    - check-success=test (py312, postgresql-file-upgrade-from-4.5)
+    - check-success=test (py312, mysql-file)
+    - check-success=test (py312, mysql-file-sqlalchemy14)
+    - check-success=test (py312, mysql-swift)
+    - check-success=test (py312, mysql-s3)
+    - check-success=test (py312, mysql-ceph)
+    - check-success=test (py312, postgresql-file)
+    - check-success=test (py312, postgresql-file-sqlalchemy14)
+    - check-success=test (py312, postgresql-swift)
+    - check-success=test (py312, postgresql-s3)
+    - check-success=test (py312, postgresql-ceph)
 
 pull_request_rules:
   - name: automatic merge
@@ -61,6 +73,18 @@ pull_request_rules:
     - check-success=test (py311, postgresql-file-sqlalchemy14)
     - check-success=test (py311, postgresql-swift)
     - check-success=test (py311, postgresql-s3)
+    - check-success=test (py312, mysql-ceph-upgrade-from-4.5)
+    - check-success=test (py312, postgresql-file-upgrade-from-4.5)
+    - check-success=test (py312, mysql-file)
+    - check-success=test (py312, mysql-file-sqlalchemy14)
+    - check-success=test (py312, mysql-swift)
+    - check-success=test (py312, mysql-s3)
+    - check-success=test (py312, mysql-ceph)
+    - check-success=test (py312, postgresql-file)
+    - check-success=test (py312, postgresql-file-sqlalchemy14)
+    - check-success=test (py312, postgresql-swift)
+    - check-success=test (py312, postgresql-s3)
+    - check-success=test (py312, postgresql-ceph)
 
   - name: automatic merge backports from Mergify
     actions:
diff --git a/images/Dockerfile.ci b/images/Dockerfile.ci
index 9abcb0061..a6b9fe128 100644
--- a/images/Dockerfile.ci
+++ b/images/Dockerfile.ci
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 ENV GNOCCHI_WORKSPACE /github/workspace
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/tox.ini b/tox.ini
index ccf2a7f84..460791935 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1
-envlist = {py39,py311}-{postgresql,mysql}{,-file,-file-sqlalchemy14,-swift,-ceph,-s3},pep8
+envlist = {py39,py311,py312}-{postgresql,mysql}{,-file,-file-sqlalchemy14,-swift,-ceph,-s3},pep8
 skipsdist = True
 
 [testenv]
@@ -59,12 +59,12 @@ allowlist_externals =
     {toxinidir}/run-tests.sh
     {toxinidir}/run-func-tests.sh
 
-[testenv:{py38,py39,py311}-{postgresql,mysql}-file-sqlalchemy14]
+[testenv:{py38,py39,py311,py312}-{postgresql,mysql}-file-sqlalchemy14]
 deps =
    {[testenv]deps}
    sqlalchemy<2
 
-[testenv:{py39,py311}-postgresql-file-upgrade-from-4.5]
+[testenv:{py39,py311,py312}-postgresql-file-upgrade-from-4.5]
 # We should always recreate since the script upgrade
 # Gnocchi we can't reuse the virtualenv
 recreate = True
@@ -79,7 +79,7 @@ deps =
 commands = {toxinidir}/run-upgrade-tests.sh postgresql-file
 allowlist_externals = {toxinidir}/run-upgrade-tests.sh
 
-[testenv:{py39,py311}-mysql-ceph-upgrade-from-4.5]
+[testenv:{py39,py311,py312}-mysql-ceph-upgrade-from-4.5]
 # We should always recreate since the script upgrade
 # Gnocchi we can't reuse the virtualenv
 recreate = True
@@ -104,7 +104,7 @@ commands = flake8 {posargs}
 allowlist_externals =
     /usr/bin/flake8
 
-[testenv:{py39,py311}-cover]
+[testenv:{py39,py311,py312}-cover]
 setenv =
     {[testenv]setenv}
     PYTHON=coverage run --source gnocchi --parallel-mode