opendev/system-config
Code Issues Proposed changes

Merge "Update Gerrit container image to python3.12"

Browse Source
This commit is contained in:
Zuul 2025-04-25 17:55:40 +00:00 committed by Gerrit Code Review
commit 789c8e6483
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/gerrit/base/Dockerfile
View File

@ -15,12 +15,12 @@
# Tue Apr 1 03:23:07 PM UTC 2025 - trigger rebuild
FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
FROM docker.io/opendevorg/python-builder:3.12-bookworm as builder
COPY . /tmp/src
RUN assemble
FROM docker.io/opendevorg/python-base:3.11-bookworm as gerrit-base
FROM docker.io/opendevorg/python-base:3.12-bookworm as gerrit-base
RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends

16
zuul.d/docker-images/gerrit.yaml
View File

@ -7,8 +7,8 @@
- opendev/jeepyb
- opendev/system-config
requires:
- python-builder-3.11-bookworm-container-image
- python-base-3.11-bookworm-container-image
- python-builder-3.12-bookworm-container-image
- python-base-3.12-bookworm-container-image
provides: gerrit-base-container-image
pre-run: &gerrit-base_prerun
- playbooks/zuul/gerrit/base.yaml
@ -28,8 +28,8 @@
description: Build and upload a gerrit-base image.
parent: system-config-upload-image
requires:
- python-builder-3.11-bookworm-container-image
- python-base-3.11-bookworm-container-image
- python-builder-3.12-bookworm-container-image
- python-base-3.12-bookworm-container-image
provides: gerrit-base-container-image
pre-run: *gerrit-base_prerun
required-projects: *gerrit_base_projects
@ -323,7 +323,9 @@
- system-config-build-image-gerrit-base:
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-gerrit-3.10:
dependencies:
@ -346,7 +348,9 @@
- system-config-upload-image-gerrit-base:
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-gerrit-3.10:
dependencies: