From 738a671459f502e0214fe978042caa545d939130 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 19 Sep 2023 10:27:47 -0700
Subject: [PATCH] Update Gerrit bot to python3.11 on bookworm

This drops python3.8 and python3.10 testing focusing only on python3.11.
At the same time we bump the container image to python3.11 and bookworm.

The eventual goal here is to have opendev services on bookworm and
python3.11 so that we can drop docker image builds for bullseye and
older python versions.

Change-Id: I37b2ed3fafb3599db95730f3a9bbb90da95ff0e4
---
 .zuul.yaml | 16 ++++++----------
 Dockerfile |  4 ++--
 setup.cfg  |  3 +--
 tox.ini    |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index e8b0fda..777f116 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,8 +20,8 @@
     description: Build OpenDev Docker images for storyboard webclient
     provides: gerritbot-container-image
     requires:
-      - python-builder-3.10-bullseye-container-image
-      - python-base-3.10-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - python-base-3.11-bookworm-container-image
     required-projects: &gerritbot_opendev_required_projects
       - opendev/gerritlib
     vars: &gerritbot_opendev_image_vars
@@ -39,8 +39,8 @@
     description: Build OpenDev gerritbot Docker images and upload to Docker Hub.
     provides: gerritbot-container-image
     requires:
-      - python-builder-3.10-bullseye-container-image
-      - python-base-3.10-bullseye-container-image
+      - python-builder-3.11-bookworm-container-image
+      - python-base-3.11-bookworm-container-image
     required-projects: *gerritbot_opendev_required_projects
     vars: *gerritbot_opendev_image_vars
     secrets:
@@ -62,17 +62,13 @@
     check:
       jobs:
         - tox-pep8
-        - tox-py38:
-            nodeset: ubuntu-focal
-        - tox-py310:
+        - tox-py311:
             nodeset: ubuntu-jammy
         - gerritbot-build-opendev-image
     gate:
       jobs:
         - tox-pep8
-        - tox-py38:
-            nodeset: ubuntu-focal
-        - tox-py310:
+        - tox-py311:
             nodeset: ubuntu-jammy
         - gerritbot-upload-opendev-image
     promote:
diff --git a/Dockerfile b/Dockerfile
index 14379b6..975aa84 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,12 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this software.  If not, see <http://www.gnu.org/licenses/>.
 
-FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
+FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM docker.io/opendevorg/python-base:3.10-bullseye as gerritbot
+FROM docker.io/opendevorg/python-base:3.11-bookworm as gerritbot
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
diff --git a/setup.cfg b/setup.cfg
index 2921ec7..9f62757 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,8 +13,7 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [entry_points]
 console_scripts =
diff --git a/tox.ini b/tox.ini
index 1788539..2deb3ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py310,py38,pep8
+envlist = py311,pep8
 
 [testenv]
 usedevelop = True