From 81d897997dcb46a57bda01ecba4e7aaf230a30dd Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 6 Feb 2025 11:56:56 -0800 Subject: [PATCH] Start using python3.12 We've had python3.12 container images for some time now but everything has been running 3.11. 3.11 has been a solid release so there hasn't been much pressure to update. But as 3.13 and beyond are starting to show up it would be good for us to start moving foward too. We start by updating the zookeeper-statsd and haproxy-statsd images as they are quite simple and should be good canaries for this new python version. Followups can migrate even more things. Change-Id: Ib289861e937c2d181d483debb80e7bc30b583d83 --- docker/haproxy-statsd/Dockerfile | 2 +- docker/zookeeper-statsd/Dockerfile | 2 +- zuul.d/docker-images/haproxy.yaml | 4 ++-- zuul.d/docker-images/zookeeper-statsd.yaml | 4 ++-- zuul.d/project.yaml | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/haproxy-statsd/Dockerfile b/docker/haproxy-statsd/Dockerfile index 31e8ec2cfd..90c0ec17b3 100644 --- a/docker/haproxy-statsd/Dockerfile +++ b/docker/haproxy-statsd/Dockerfile @@ -15,7 +15,7 @@ # Wed May 24 18:38:17 UTC 2023 - trigger rebuild -FROM docker.io/opendevorg/python-base:3.11-bookworm +FROM docker.io/opendevorg/python-base:3.12-bookworm COPY haproxy-statsd.py /usr/local/bin RUN pip install statsd diff --git a/docker/zookeeper-statsd/Dockerfile b/docker/zookeeper-statsd/Dockerfile index ff7d7f7e04..537137c7f8 100644 --- a/docker/zookeeper-statsd/Dockerfile +++ b/docker/zookeeper-statsd/Dockerfile @@ -16,7 +16,7 @@ # Wed May 24 18:38:17 UTC 2023 - trigger rebuild -FROM docker.io/opendevorg/python-base:3.11-bookworm +FROM docker.io/opendevorg/python-base:3.12-bookworm COPY zookeeper-statsd.py /usr/local/bin RUN pip install statsd diff --git a/zuul.d/docker-images/haproxy.yaml b/zuul.d/docker-images/haproxy.yaml index 388943ffbd..431b4c714c 100644 --- a/zuul.d/docker-images/haproxy.yaml +++ b/zuul.d/docker-images/haproxy.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-haproxy-statsd description: Build a haproxy-statsd image. parent: system-config-build-image - requires: python-base-3.11-bookworm-container-image + requires: python-base-3.12-bookworm-container-image provides: haproxy-statsd-container-image vars: &haproxy-statsd_vars docker_images: @@ -18,7 +18,7 @@ name: system-config-upload-image-haproxy-statsd description: Build and upload a haproxy-statsd image. parent: system-config-upload-image - requires: python-base-3.11-bookworm-container-image + requires: python-base-3.12-bookworm-container-image provides: haproxy-statsd-container-image vars: *haproxy-statsd_vars files: *haproxy-statsd_files diff --git a/zuul.d/docker-images/zookeeper-statsd.yaml b/zuul.d/docker-images/zookeeper-statsd.yaml index feba34c6a6..3918dcfa7e 100644 --- a/zuul.d/docker-images/zookeeper-statsd.yaml +++ b/zuul.d/docker-images/zookeeper-statsd.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-zookeeper-statsd description: Build a zookeeper-statsd image. parent: system-config-build-image - requires: python-base-3.11-bookworm-container-image + requires: python-base-3.12-bookworm-container-image vars: &zookeeper-statsd_vars docker_images: - context: docker/zookeeper-statsd @@ -16,7 +16,7 @@ name: system-config-upload-image-zookeeper-statsd description: Build and upload a zookeeper-statsd image. parent: system-config-upload-image - requires: python-base-3.11-bookworm-container-image + requires: python-base-3.12-bookworm-container-image vars: *zookeeper-statsd_vars files: *zookeeper-statsd_files diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 8d2c189611..bbc221fa17 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -124,12 +124,12 @@ - system-config-build-image-haproxy-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.11-bookworm + - name: system-config-build-image-python-base-3.12-bookworm soft: true - system-config-build-image-zookeeper-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.11-bookworm + - name: system-config-build-image-python-base-3.12-bookworm soft: true - system-config-build-image-accessbot: dependencies: @@ -274,12 +274,12 @@ - system-config-upload-image-haproxy-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-base-3.11-bookworm + - name: system-config-upload-image-python-base-3.12-bookworm soft: true - system-config-upload-image-zookeeper-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-base-3.11-bookworm + - name: system-config-upload-image-python-base-3.12-bookworm soft: true - system-config-upload-image-accessbot: dependencies: