From d3a7e8cd60c76a42a4af2ca3addbd3f4540708b3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 7 Aug 2025 12:32:39 -0700 Subject: [PATCH] Reapply "Migrate statsd sidecar container images to quay.io" This reverts commit d24f648db8eefae4649bf683b254f0a47640ba32. This is a partial revert that only moves the image publication location to quay. A followup change will update the image consumption location. We split them up to avoid problems if image promotion does not succeed. We're able to make this change because both the zuul and gitea load balancers as well as teh zookeeper cluster are running on Noble with podman now. This means we don't lose speculative testing of container image updates when the images are hosted on quay. Change-Id: Id14e56d2e5a1b0045fea79fe8ae27f8967b9a4c7 --- docker/haproxy-statsd/Dockerfile | 2 +- docker/zookeeper-statsd/Dockerfile | 2 +- zuul.d/docker-images/haproxy.yaml | 15 ++++++++++----- zuul.d/docker-images/zookeeper-statsd.yaml | 15 ++++++++++----- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/docker/haproxy-statsd/Dockerfile b/docker/haproxy-statsd/Dockerfile index 154f4e2da8..7c24a9e61a 100644 --- a/docker/haproxy-statsd/Dockerfile +++ b/docker/haproxy-statsd/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Tue Mar 11 06:08:37 PM UTC 2025 - trigger rebuild +# Thu Aug 7 07:33:54 PM UTC 2025 - trigger rebuild FROM docker.io/opendevorg/python-base:3.12-bookworm diff --git a/docker/zookeeper-statsd/Dockerfile b/docker/zookeeper-statsd/Dockerfile index 47039ea6d5..76c636dce6 100644 --- a/docker/zookeeper-statsd/Dockerfile +++ b/docker/zookeeper-statsd/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Tue Mar 11 06:08:37 PM UTC 2025 - trigger rebuild +# Thu Aug 7 07:33:54 PM UTC 2025 - trigger rebuild FROM docker.io/opendevorg/python-base:3.12-bookworm diff --git a/zuul.d/docker-images/haproxy.yaml b/zuul.d/docker-images/haproxy.yaml index 431b4c714c..9051d2187a 100644 --- a/zuul.d/docker-images/haproxy.yaml +++ b/zuul.d/docker-images/haproxy.yaml @@ -2,13 +2,18 @@ - job: name: system-config-build-image-haproxy-statsd description: Build a haproxy-statsd image. - parent: system-config-build-image + parent: system-config-build-container-image requires: python-base-3.12-bookworm-container-image provides: haproxy-statsd-container-image vars: &haproxy-statsd_vars - docker_images: + promote_container_image_job: system-config-upload-image-haproxy-statsd + container_images: - context: docker/haproxy-statsd - repository: opendevorg/haproxy-statsd + registry: quay.io + repository: quay.io/opendevorg/haproxy-statsd + namespace: opendevorg + repo_shortname: haproxy-statsd + repo_description: Tool to report HaProxy stats to statsd # Duplicate in the run-gitea job files: &haproxy-statsd_files - docker/haproxy-statsd/ @@ -17,7 +22,7 @@ - job: name: system-config-upload-image-haproxy-statsd description: Build and upload a haproxy-statsd image. - parent: system-config-upload-image + parent: system-config-upload-container-image requires: python-base-3.12-bookworm-container-image provides: haproxy-statsd-container-image vars: *haproxy-statsd_vars @@ -26,6 +31,6 @@ - job: name: system-config-promote-image-haproxy-statsd description: Promote a previously published haproxy-statsd image to latest. - parent: system-config-promote-image + parent: system-config-promote-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 3918dcfa7e..5cc7a6b676 100644 --- a/zuul.d/docker-images/zookeeper-statsd.yaml +++ b/zuul.d/docker-images/zookeeper-statsd.yaml @@ -2,12 +2,17 @@ - job: name: system-config-build-image-zookeeper-statsd description: Build a zookeeper-statsd image. - parent: system-config-build-image + parent: system-config-build-container-image requires: python-base-3.12-bookworm-container-image vars: &zookeeper-statsd_vars - docker_images: + promote_container_image_job: system-config-upload-image-zookeeper-statsd + container_images: - context: docker/zookeeper-statsd - repository: opendevorg/zookeeper-statsd + registry: quay.io + repository: quay.io/opendevorg/zookeeper-statsd + namespace: opendevorg + repo_shortname: zookeeper-statsd + repo_description: Tool to report ZooKeeper stats to statsd files: &zookeeper-statsd_files - docker/zookeeper-statsd/ - docker/python-base/ @@ -15,7 +20,7 @@ - job: name: system-config-upload-image-zookeeper-statsd description: Build and upload a zookeeper-statsd image. - parent: system-config-upload-image + parent: system-config-upload-container-image requires: python-base-3.12-bookworm-container-image vars: *zookeeper-statsd_vars files: *zookeeper-statsd_files @@ -23,6 +28,6 @@ - job: name: system-config-promote-image-zookeeper-statsd description: Promote a previously published zookeeper-statsd image to latest. - parent: system-config-promote-image + parent: system-config-promote-container-image vars: *zookeeper-statsd_vars files: *zookeeper-statsd_files