From 7e28263067f7e0f63c520932788764a742bb4ecd Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 30 Oct 2024 10:15:30 -0700
Subject: [PATCH] Run image builds on noble

This runs our zuul-registry container image builds on noble because we
rely on skopeo being able to talk to docker's daemon but jammy skopeo is
too old to talk to modern docker. Running on noble should get us newer
skopeo can speak to new docker as well. Note we explicitly add
python3-setuptools to the extra packages list because docker-compose
needs it and doesn't explicitly list it as a dependency.

While we are at it we add python3.12 unittesting on noble too.

Change-Id: I3e84b0a5fc9cd29ab8cf510a59ef6bfed8b5abbd
---
 .zuul.yaml                         | 8 ++++++--
 playbooks/functional-test/run.yaml | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4b690ef..02e4974 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -38,7 +38,7 @@
       - python-builder-3.11-bullseye-container-image
       - python-base-3.11-bullseye-container-image
     provides: zuul-registry-container-image
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
     vars: &image_vars
       promote_container_image_method: intermediate-registry
       promote_container_image_job: zuul-registry-upload-image
@@ -60,7 +60,7 @@
     allowed-projects: zuul/zuul-registry
     run: playbooks/functional-test/run.yaml
     post-run: playbooks/functional-test/post.yaml
-    nodeset: ubuntu-jammy
+    nodeset: ubuntu-noble
     secrets:
       name: container_registry_credentials
       secret: zuul-registry-registry-credentials
@@ -95,6 +95,8 @@
             nodeset: ubuntu-focal
         - nox-py311:
             nodeset: ubuntu-jammy
+        - nox-py312:
+            nodeset: ubuntu-noble
         - build-python-release
     gate:
       jobs:
@@ -104,6 +106,8 @@
             nodeset: ubuntu-focal
         - nox-py311:
             nodeset: ubuntu-jammy
+        - nox-py312:
+            nodeset: ubuntu-noble
         - build-python-release
     promote:
       jobs:
diff --git a/playbooks/functional-test/run.yaml b/playbooks/functional-test/run.yaml
index 980e415..657f420 100644
--- a/playbooks/functional-test/run.yaml
+++ b/playbooks/functional-test/run.yaml
@@ -18,6 +18,11 @@
     - name: Install extra packages
       package:
         name:
+          # Explicitly install python3-setuptools for docker-compose
+          # docker-compose relies on distutils which is not included in
+          # python3 with 3.12 or newer and the package doesn't list an
+          # explicit dependency.
+          - python3-setuptools
           - docker-compose
           - openssl
           - skopeo