opendev/system-config
Code Issues Proposed changes

Build haproxy and zk statsd containers on Trixie

Browse Source 
We need to move the Gerrit container onto Trixie in order to get access
to its openjdk 21 packages. Before we do that it would be good to have a
sanity check that our trixie container images operate as expected with
less impactful services. The two statsd reporting container images for
haproxy and zookeeper have been selected for this purpose. Update them
to our trixie python3.12 image stack.

If this looks good we may do an irc bot or two next before finally
updating Gerrit.

Change-Id: I1341c3691fd14e491015c78ef8ec01578e086c24
This commit is contained in:
Clark Boylan
2025-12-08 16:18:42 -08:00
parent 0d56571662
commit 13fa9568a5
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/haproxy-statsd/Dockerfile
View File

@@ -15,7 +15,7 @@
# Thu Aug 7 07:33:54 PM UTC 2025 - trigger rebuild
FROM quay.io/opendevorg/python-base:3.12-bookworm
FROM quay.io/opendevorg/python-base:3.12-trixie
COPY haproxy-statsd.py /usr/local/bin
RUN pip install statsd

2
docker/zookeeper-statsd/Dockerfile
View File

@@ -16,7 +16,7 @@
# Thu Aug 7 07:33:54 PM UTC 2025 - trigger rebuild
FROM quay.io/opendevorg/python-base:3.12-bookworm
FROM quay.io/opendevorg/python-base:3.12-trixie
COPY zookeeper-statsd.py /usr/local/bin
RUN pip install statsd

4
zuul.d/docker-images/haproxy.yaml
View File

@@ -3,7 +3,7 @@
name: system-config-build-image-haproxy-statsd
description: Build a haproxy-statsd image.
parent: system-config-build-container-image
requires: python-base-3.12-bookworm-container-image
requires: python-base-3.12-trixie-container-image
provides: haproxy-statsd-container-image
vars: &haproxy-statsd_vars
promote_container_image_job: system-config-upload-image-haproxy-statsd
@@ -24,7 +24,7 @@
name: system-config-upload-image-haproxy-statsd
description: Build and upload a haproxy-statsd image.
parent: system-config-upload-container-image
requires: python-base-3.12-bookworm-container-image
requires: python-base-3.12-trixie-container-image
provides: haproxy-statsd-container-image
vars: *haproxy-statsd_vars
files: *haproxy-statsd_files

4
zuul.d/docker-images/zookeeper-statsd.yaml
View File

@@ -3,7 +3,7 @@
name: system-config-build-image-zookeeper-statsd
description: Build a zookeeper-statsd image.
parent: system-config-build-container-image
requires: python-base-3.12-bookworm-container-image
requires: python-base-3.12-trixie-container-image
vars: &zookeeper-statsd_vars
promote_container_image_job: system-config-upload-image-zookeeper-statsd
container_command: docker
@@ -22,7 +22,7 @@
name: system-config-upload-image-zookeeper-statsd
description: Build and upload a zookeeper-statsd image.
parent: system-config-upload-container-image
requires: python-base-3.12-bookworm-container-image
requires: python-base-3.12-trixie-container-image
vars: *zookeeper-statsd_vars
files: *zookeeper-statsd_files

8
zuul.d/project.yaml
View File

@@ -108,12 +108,12 @@
- system-config-build-image-haproxy-statsd:
dependencies:
- name: opendev-buildset-registry
- name: system-config-build-image-python-base-3.12-bookworm
- name: system-config-build-image-python-base-3.12-trixie
soft: true
- system-config-build-image-zookeeper-statsd:
dependencies:
- name: opendev-buildset-registry
- name: system-config-build-image-python-base-3.12-bookworm
- name: system-config-build-image-python-base-3.12-trixie
soft: true
- system-config-build-image-accessbot:
dependencies:
@@ -251,12 +251,12 @@
- system-config-upload-image-haproxy-statsd:
dependencies:
- name: opendev-buildset-registry
- name: system-config-upload-image-python-base-3.12-bookworm
- name: system-config-upload-image-python-base-3.12-trixie
soft: true
- system-config-upload-image-zookeeper-statsd:
dependencies:
- name: opendev-buildset-registry
- name: system-config-upload-image-python-base-3.12-bookworm
- name: system-config-upload-image-python-base-3.12-trixie
soft: true
- system-config-upload-image-accessbot:
dependencies: