zuul/zuul-registry
Code Issues Proposed changes

Run image builds on noble

Browse Source 
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
This commit is contained in:
Clark Boylan 2024-10-30 10:15:30 -07:00
parent 1d5d27c85f
commit 7e28263067
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.yaml
View File

@ -38,7 +38,7 @@
- python-builder-3.11-bullseye-container-image - python-builder-3.11-bullseye-container-image
- python-base-3.11-bullseye-container-image - python-base-3.11-bullseye-container-image
provides: zuul-registry-container-image provides: zuul-registry-container-image
nodeset: ubuntu-jammy nodeset: ubuntu-noble
vars: &image_vars vars: &image_vars
promote_container_image_method: intermediate-registry promote_container_image_method: intermediate-registry
promote_container_image_job: zuul-registry-upload-image promote_container_image_job: zuul-registry-upload-image
@ -60,7 +60,7 @@
allowed-projects: zuul/zuul-registry allowed-projects: zuul/zuul-registry
run: playbooks/functional-test/run.yaml run: playbooks/functional-test/run.yaml
post-run: playbooks/functional-test/post.yaml post-run: playbooks/functional-test/post.yaml
nodeset: ubuntu-jammy nodeset: ubuntu-noble
secrets: secrets:
name: container_registry_credentials name: container_registry_credentials
secret: zuul-registry-registry-credentials secret: zuul-registry-registry-credentials
@ -95,6 +95,8 @@
nodeset: ubuntu-focal nodeset: ubuntu-focal
- nox-py311: - nox-py311:
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
- nox-py312:
nodeset: ubuntu-noble
- build-python-release - build-python-release
gate: gate:
jobs: jobs:
@ -104,6 +106,8 @@
nodeset: ubuntu-focal nodeset: ubuntu-focal
- nox-py311: - nox-py311:
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
- nox-py312:
nodeset: ubuntu-noble
- build-python-release - build-python-release
promote: promote:
jobs: jobs:

5
playbooks/functional-test/run.yaml
View File

@ -18,6 +18,11 @@
- name: Install extra packages - name: Install extra packages
package: package:
name: 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 - docker-compose
- openssl - openssl
- skopeo - skopeo