From aca007e9087a79202fdbfd167dc5ab1e3e08b248 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 14 Oct 2022 14:41:47 -0700
Subject: [PATCH] Update docker images to python 3.10

We do this for two reasons. The first is that Zuul proper has shown
python 3.10 is a bit quicker than 3.8 and we should take advantage of
that. The second is OpenDev would like to drop image builds for python
3.8 to make room for the upcoming release of python 3.11.

Note we add python 3.10 testing to ensure we don't regress the images by
making this change.

Change-Id: I3630c376cef775ce622618bf5f6e59cf62c4f492
---
 .zuul.yaml | 14 ++++++++++----
 Dockerfile |  4 ++--
 setup.cfg  |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index e6cdd9b..69d2c0b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,8 +21,8 @@
     allowed-projects: zuul/zuul-client
     timeout: 2700
     requires:
-      - python-builder-3.8-bullseye-container-image
-      - python-base-3.8-bullseye-container-image
+      - python-builder-3.10-bullseye-container-image
+      - python-base-3.10-bullseye-container-image
     provides:
       - zuul-client-container-image
     vars: &zuulclient_image_vars
@@ -38,8 +38,8 @@
     description: Build the CLI Docker image and upload to Docker Hub.
     timeout: 3600
     requires:
-      - python-builder-3.8-bullseye-container-image
-      - python-base-3.8-bullseye-container-image
+      - python-builder-3.10-bullseye-container-image
+      - python-base-3.10-bullseye-container-image
     provides: zuul-client-container-image
     vars: *zuulclient_image_vars
     secrets:
@@ -74,6 +74,9 @@
         - tox-py38:
             nodeset: ubuntu-bionic
             timeout: 3600
+        - tox-py310:
+            nodeset: ubuntu-jammy
+            timeout: 3600
         - zuul-tox-zuul-client
         - build-python-release
     gate:
@@ -88,6 +91,9 @@
         - tox-py38:
             nodeset: ubuntu-bionic
             timeout: 3600
+        - tox-py310:
+            nodeset: ubuntu-jammy
+            timeout: 3600
         - zuul-tox-zuul-client
         - build-python-release
         - zuul-client-upload-image
diff --git a/Dockerfile b/Dockerfile
index 92a470e..0365ed3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM docker.io/opendevorg/python-builder:3.8-bullseye as builder
+FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
 
 COPY . /tmp/src
 RUN assemble
 
-FROM docker.io/opendevorg/python-base:3.8-bullseye
+FROM docker.io/opendevorg/python-base:3.10-bullseye
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep
diff --git a/setup.cfg b/setup.cfg
index e8b8c24..ab9e668 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,6 +30,7 @@ classifier =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3 :: Only
     Topic :: Software Development :: Quality Assurance
     Topic :: Software Development :: Testing