diff --git a/docker/matrix-eavesdrop/Dockerfile b/docker/matrix-eavesdrop/Dockerfile index 1afe3f3ac3..1157d991b5 100644 --- a/docker/matrix-eavesdrop/Dockerfile +++ b/docker/matrix-eavesdrop/Dockerfile @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder +FROM docker.io/opendevorg/python-builder:3.12-bookworm as builder COPY src /tmp/src RUN assemble -FROM docker.io/opendevorg/python-base:3.11-bookworm as eavesdrop +FROM docker.io/opendevorg/python-base:3.12-bookworm as eavesdrop COPY --from=builder /output/ /output RUN /output/install-from-bindep \ diff --git a/zuul.d/docker-images/eavesdrop.yaml b/zuul.d/docker-images/eavesdrop.yaml index f23d881cf4..e465d1e08d 100644 --- a/zuul.d/docker-images/eavesdrop.yaml +++ b/zuul.d/docker-images/eavesdrop.yaml @@ -4,8 +4,8 @@ description: Build a matrix-eavesdrop image. parent: system-config-build-image requires: &matrix-eavesdrop_requires - - python-base-3.11-bookworm-container-image - - python-builder-3.11-bookworm-container-image + - python-base-3.12-bookworm-container-image + - python-builder-3.12-bookworm-container-image provides: matrix-eavesdrop-container-image vars: &matrix-eavesdrop_vars docker_images: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index dfd1b890d2..dbb4e50bcb 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -144,7 +144,9 @@ - system-config-build-image-matrix-eavesdrop: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.11-bookworm + - name: system-config-build-image-python-builder-3.12-bookworm + soft: true + - name: system-config-build-image-python-base-3.12-bookworm soft: true - system-config-build-image-python-base-3.11-bookworm - system-config-build-image-python-base-3.11-bookworm-debug @@ -291,7 +293,9 @@ - system-config-upload-image-matrix-eavesdrop: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-builder-3.11-bookworm + - name: system-config-upload-image-python-builder-3.12-bookworm + soft: true + - name: system-config-upload-image-python-base-3.12-bookworm soft: true - system-config-upload-image-python-base-3.11-bookworm - system-config-upload-image-python-base-3.11-bookworm-debug