opendev/system-config
Code Issues Proposed changes

Merge "Build trixie python base container images"

Browse Source
This commit is contained in:
Zuul
2025-09-11 18:54:48 +00:00
committed by Gerrit Code Review
parent dc30908c15 095e8553b7
commit 4a59d1d482
6 changed files with 439 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/python-base/Dockerfile
View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Comment to force rebuilds Thu Sep 11 04:52:28 PM UTC 2025
# Comment to force rebuilds Thu Sep 11 05:05:02 PM UTC 2025
ARG PYTHON_VERSION=3.11
ARG DEBIAN_VERSION=bookworm

2
docker/python-builder/Dockerfile
View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Comment to force rebuilds Thu Sep 11 04:52:28 PM UTC 2025
# Comment to force rebuilds Thu Sep 11 05:05:02 PM UTC 2025
ARG PYTHON_VERSION=3.11
ARG DEBIAN_VERSION=bookworm

2
docker/uwsgi-base/Dockerfile
View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Comment to force rebuilds Thu Sep 11 04:52:28 PM UTC 2025
# Comment to force rebuilds Thu Sep 11 05:05:02 PM UTC 2025
ARG PYTHON_VERSION=3.11
ARG DEBIAN_VERSION=bookworm

206
zuul.d/docker-images/python-3.11-trixie.yaml Normal file
View File

@@ -0,0 +1,206 @@
# python-builder-3.11-trixie jobs
- job:
name: system-config-build-image-python-builder-3.11-trixie
description: Build a python-builder-3.11-trixie image.
parent: system-config-build-container-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.11-trixie-container-image
vars: &python-builder_3_11_trixie_vars
promote_container_image_job: system-config-upload-image-python-builder-3.11-trixie
container_command: docker
container_images:
- context: docker/python-builder
registry: quay.io
repository: quay.io/opendevorg/python-builder
namespace: opendevorg
repo_shortname: python-builder
repo_description: Python builder image for smaller prod python images.
tags:
- 3.11-trixie
arch:
- linux/amd64
- linux/arm64
build_args:
- PYTHON_VERSION=3.11
- DEBIAN_VERSION=trixie
files: &python-builder_3_11_trixie_files
- docker/python-base/
- docker/python-builder/
- zuul.d/docker-images/python-3.11-trixie.yaml
- job:
name: system-config-upload-image-python-builder-3.11-trixie
description: Build and upload a python-builder-3.11-trixie image.
parent: system-config-upload-container-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.11-trixie-container-image
vars: *python-builder_3_11_trixie_vars
files: *python-builder_3_11_trixie_files
- job:
name: system-config-promote-image-python-builder-3.11-trixie
description: Promote a previously published python-builder-3.11-trixie image to latest.
parent: system-config-promote-container-image
vars: *python-builder_3_11_trixie_vars
files: *python-builder_3_11_trixie_files
# python-base-3.11-trixie jobs
- job:
name: system-config-build-image-python-base-3.11-trixie
description: Build a python-base-3.11-trixie image.
parent: system-config-build-container-image
timeout: 3600
provides:
- python-base-container-image
- python-base-3.11-trixie-container-image
vars: &python-base_3_11_trixie_vars
promote_container_image_job: system-config-upload-image-python-base-3.11-trixie
container_command: docker
container_images:
- context: docker/python-base
registry: quay.io
repository: quay.io/opendevorg/python-base
namespace: opendevorg
repo_shortname: python-base
repo_description: Minimal python production image.
tags:
- 3.11-trixie
arch:
- linux/amd64
- linux/arm64
build_args:
- PYTHON_VERSION=3.11
- DEBIAN_VERSION=trixie
files: &python-base_3_11_trixie_files
- docker/python-base/
- docker/python-builder/
- zuul.d/docker-images/python-3.11-trixie.yaml
- job:
name: system-config-upload-image-python-base-3.11-trixie
description: Build and upload a python-base-3.11-trixie image.
parent: system-config-upload-container-image
timeout: 3600
provides: python-base-3.11-trixie-container-image
vars: *python-base_3_11_trixie_vars
files: *python-base_3_11_trixie_files
- job:
name: system-config-promote-image-python-base-3.11-trixie
description: Promote a previously published python-base-3.11-trixie image to latest.
parent: system-config-promote-container-image
vars: *python-base_3_11_trixie_vars
files: *python-base_3_11_trixie_files
# python-base-3.11-trixie-debug jobs
- job:
name: system-config-build-image-python-base-3.11-trixie-debug
description: Build a python-base-3.11-trixie debug image.
parent: system-config-build-container-image
timeout: 3600
provides:
- python-base-3.11-trixie-debug-container-image
vars: &python-base_3_11_trixie_debug_vars
promote_container_image_job: system-config-upload-image-python-base-3.11-trixie-debug
container_command: docker
container_images:
- context: docker/python-base
registry: quay.io
repository: quay.io/opendevorg/python-base
namespace: opendevorg
repo_shortname: python-base
repo_description: Minimal python production image.
tags:
- 3.11-trixie-debug
arch:
- linux/amd64
- linux/arm64
build_args:
- PYTHON_VERSION=3.11
- DEBIAN_VERSION=trixie
# Blank here means not the default of "slim-"
- IMAGE_FLAVOR=
files: &python-base_3_11_trixie_debug_files
- docker/python-base/
- docker/python-builder/
- zuul.d/docker-images/python-3.11-trixie.yaml
- job:
name: system-config-upload-image-python-base-3.11-trixie-debug
description: Build and upload a python-base-3.11-trixie debug image.
parent: system-config-upload-container-image
timeout: 3600
provides: python-base-3.11-trixie-debug-container-image
vars: *python-base_3_11_trixie_debug_vars
files: *python-base_3_11_trixie_debug_files
- job:
name: system-config-promote-image-python-base-3.11-trixie-debug
description: Promote a previously published python-base-3.11-trixie debug image to latest.
parent: system-config-promote-container-image
vars: *python-base_3_11_trixie_debug_vars
files: *python-base_3_11_trixie_debug_files
# uwsgi-base-3.11-trixie jobs
- job:
name: system-config-build-image-uwsgi-base-3.11-trixie
description: Build a uwsgi-base-3.11-trixie image.
parent: system-config-build-container-image
timeout: 3600
requires: &uwsgi-base_3_11_trixie_requires
- python-base-3.11-trixie-container-image
- python-builder-3.11-trixie-container-image
provides: uwsgi-base-3.11-trixie-container-image
dependencies:
- name: system-config-build-image-python-base-3.11-trixie
soft: true
- name: system-config-build-image-python-builder-3.11-trixie
soft: true
vars: &uwsgi-base_3_11_trixie_vars
promote_container_image_job: system-config-upload-image-uwsgi-base-3.11-trixie
container_command: docker
container_images:
- context: docker/uwsgi-base
registry: quay.io
repository: quay.io/opendevorg/uwsgi-base
namespace: opendevorg
repo_shortname: uwsgi-base
repo_description: Minimal UWSGI production image.
tags:
- 3.11-trixie
arch:
- linux/amd64
build_args:
- PYTHON_VERSION=3.11
- DEBIAN_VERSION=trixie
files: &uwsgi-base_3_11_trixie_files
- docker/python-base/
- docker/python-builder/
- docker/uwsgi-base/
- zuul.d/docker-images/python-3.11-trixie.yaml
- job:
name: system-config-upload-image-uwsgi-base-3.11-trixie
description: Build and upload a uwsgi-base-3.11-trixie image.
parent: system-config-upload-container-image
timeout: 3600
provides: uwsgi-base-3.11-trixie-container-image
requires: *uwsgi-base_3_11_trixie_requires
dependencies:
- name: system-config-upload-image-python-base-3.11-trixie
soft: true
- name: system-config-upload-image-python-builder-3.11-trixie
soft: true
vars: *uwsgi-base_3_11_trixie_vars
files: *uwsgi-base_3_11_trixie_files
- job:
name: system-config-promote-image-uwsgi-base-3.11-trixie
description: Promote a previously published uwsgi-base-3.11-trixie image to latest.
parent: system-config-promote-container-image
vars: *uwsgi-base_3_11_trixie_vars
files: *uwsgi-base_3_11_trixie_files

206
zuul.d/docker-images/python-3.12-trixie.yaml Normal file
View File

@@ -0,0 +1,206 @@
# python-builder-3.12-trixie jobs
- job:
name: system-config-build-image-python-builder-3.12-trixie
description: Build a python-builder-3.12-trixie image.
parent: system-config-build-container-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.12-trixie-container-image
vars: &python-builder_3_12_trixie_vars
promote_container_image_job: system-config-upload-image-python-builder-3.12-trixie
container_command: docker
container_images:
- context: docker/python-builder
registry: quay.io
repository: quay.io/opendevorg/python-builder
namespace: opendevorg
repo_shortname: python-builder
repo_description: Python builder image for smaller prod python images.
tags:
- 3.12-trixie
arch:
- linux/amd64
- linux/arm64
build_args:
- PYTHON_VERSION=3.12
- DEBIAN_VERSION=trixie
files: &python-builder_3_12_trixie_files
- docker/python-base/
- docker/python-builder/
- zuul.d/docker-images/python-3.12-trixie.yaml
- job:
name: system-config-upload-image-python-builder-3.12-trixie
description: Build and upload a python-builder-3.12-trixie image.
parent: system-config-upload-container-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.12-trixie-container-image
vars: *python-builder_3_12_trixie_vars
files: *python-builder_3_12_trixie_files
- job:
name: system-config-promote-image-python-builder-3.12-trixie
description: Promote a previously published python-builder-3.12-trixie image to latest.
parent: system-config-promote-container-image
vars: *python-builder_3_12_trixie_vars
files: *python-builder_3_12_trixie_files
# python-base-3.12-trixie jobs
- job:
name: system-config-build-image-python-base-3.12-trixie
description: Build a python-base-3.12-trixie image.
parent: system-config-build-container-image
timeout: 3600
provides:
- python-base-container-image
- python-base-3.12-trixie-container-image
vars: &python-base_3_12_trixie_vars
promote_container_image_job: system-config-upload-image-python-base-3.12-trixie
container_command: docker
container_images:
- context: docker/python-base
registry: quay.io
repository: quay.io/opendevorg/python-base
namespace: opendevorg
repo_shortname: python-base
repo_description: Minimal python production image.
tags:
- 3.12-trixie
arch:
- linux/amd64
- linux/arm64
build_args:
- PYTHON_VERSION=3.12
- DEBIAN_VERSION=trixie
files: &python-base_3_12_trixie_files
- docker/python-base/
- docker/python-builder/
- zuul.d/docker-images/python-3.12-trixie.yaml
- job:
name: system-config-upload-image-python-base-3.12-trixie
description: Build and upload a python-base-3.12-trixie image.
parent: system-config-upload-container-image
timeout: 3600
provides: python-base-3.12-trixie-container-image
vars: *python-base_3_12_trixie_vars
files: *python-base_3_12_trixie_files
- job:
name: system-config-promote-image-python-base-3.12-trixie
description: Promote a previously published python-base-3.12-trixie image to latest.
parent: system-config-promote-container-image
vars: *python-base_3_12_trixie_vars
files: *python-base_3_12_trixie_files
# python-base-3.12-trixie-debug jobs
- job:
name: system-config-build-image-python-base-3.12-trixie-debug
description: Build a python-base-3.12-trixie debug image.
parent: system-config-build-container-image
timeout: 3600
provides:
- python-base-3.12-trixie-debug-container-image
vars: &python-base_3_12_trixie_debug_vars
promote_container_image_job: system-config-upload-image-python-base-3.12-trixie-debug
container_command: docker
container_images:
- context: docker/python-base
registry: quay.io
repository: quay.io/opendevorg/python-base
namespace: opendevorg
repo_shortname: python-base
repo_description: Minimal python production image.
tags:
- 3.12-trixie-debug
arch:
- linux/amd64
- linux/arm64
build_args:
- PYTHON_VERSION=3.12
- DEBIAN_VERSION=trixie
# Blank here means not the default of "slim-"
- IMAGE_FLAVOR=
files: &python-base_3_12_trixie_debug_files
- docker/python-base/
- docker/python-builder/
- zuul.d/docker-images/python-3.12-trixie.yaml
- job:
name: system-config-upload-image-python-base-3.12-trixie-debug
description: Build and upload a python-base-3.12-trixie debug image.
parent: system-config-upload-container-image
timeout: 3600
provides: python-base-3.12-trixie-debug-container-image
vars: *python-base_3_12_trixie_debug_vars
files: *python-base_3_12_trixie_debug_files
- job:
name: system-config-promote-image-python-base-3.12-trixie-debug
description: Promote a previously published python-base-3.12-trixie debug image to latest.
parent: system-config-promote-container-image
vars: *python-base_3_12_trixie_debug_vars
files: *python-base_3_12_trixie_debug_files
# uwsgi-base-3.12-trixie jobs
- job:
name: system-config-build-image-uwsgi-base-3.12-trixie
description: Build a uwsgi-base-3.12-trixie image.
parent: system-config-build-container-image
timeout: 3600
requires: &uwsgi-base_3_12_trixie_requires
- python-base-3.12-trixie-container-image
- python-builder-3.12-trixie-container-image
provides: uwsgi-base-3.12-trixie-container-image
dependencies:
- name: system-config-build-image-python-base-3.12-trixie
soft: true
- name: system-config-build-image-python-builder-3.12-trixie
soft: true
vars: &uwsgi-base_3_12_trixie_vars
promote_container_image_job: system-config-upload-image-uwsgi-base-3.12-trixie
container_command: docker
container_images:
- context: docker/uwsgi-base
registry: quay.io
repository: quay.io/opendevorg/uwsgi-base
namespace: opendevorg
repo_shortname: uwsgi-base
repo_description: Minimal UWSGI production image.
tags:
- 3.12-trixie
arch:
- linux/amd64
build_args:
- PYTHON_VERSION=3.12
- DEBIAN_VERSION=trixie
files: &uwsgi-base_3_12_trixie_files
- docker/python-base/
- docker/python-builder/
- docker/uwsgi-base/
- zuul.d/docker-images/python-3.12-trixie.yaml
- job:
name: system-config-upload-image-uwsgi-base-3.12-trixie
description: Build and upload a uwsgi-base-3.12-trixie image.
parent: system-config-upload-container-image
timeout: 3600
provides: uwsgi-base-3.12-trixie-container-image
requires: *uwsgi-base_3_12_trixie_requires
dependencies:
- name: system-config-upload-image-python-base-3.12-trixie
soft: true
- name: system-config-upload-image-python-builder-3.12-trixie
soft: true
vars: *uwsgi-base_3_12_trixie_vars
files: *uwsgi-base_3_12_trixie_files
- job:
name: system-config-promote-image-uwsgi-base-3.12-trixie
description: Promote a previously published uwsgi-base-3.12-trixie image to latest.
parent: system-config-promote-container-image
vars: *uwsgi-base_3_12_trixie_vars
files: *uwsgi-base_3_12_trixie_files

24
zuul.d/project.yaml
View File

@@ -147,6 +147,14 @@
- system-config-build-image-python-builder-3.12-bookworm
- system-config-build-image-uwsgi-base-3.11-bookworm
- system-config-build-image-uwsgi-base-3.12-bookworm
- system-config-build-image-python-base-3.11-trixie
- system-config-build-image-python-base-3.11-trixie-debug
- system-config-build-image-python-base-3.12-trixie
- system-config-build-image-python-base-3.12-trixie-debug
- system-config-build-image-python-builder-3.11-trixie
- system-config-build-image-python-builder-3.12-trixie
- system-config-build-image-uwsgi-base-3.11-trixie
- system-config-build-image-uwsgi-base-3.12-trixie
check-arm64:
jobs:
- system-config-run-base-arm64
@@ -287,6 +295,14 @@
- system-config-upload-image-python-builder-3.12-bookworm
- system-config-upload-image-uwsgi-base-3.11-bookworm
- system-config-upload-image-uwsgi-base-3.12-bookworm
- system-config-upload-image-python-base-3.11-trixie
- system-config-upload-image-python-base-3.11-trixie-debug
- system-config-upload-image-python-base-3.12-trixie
- system-config-upload-image-python-base-3.12-trixie-debug
- system-config-upload-image-python-builder-3.11-trixie
- system-config-upload-image-python-builder-3.12-trixie
- system-config-upload-image-uwsgi-base-3.11-trixie
- system-config-upload-image-uwsgi-base-3.12-trixie
promote:
jobs:
- opendev-promote-docs
@@ -312,6 +328,14 @@
- system-config-promote-image-python-builder-3.12-bookworm
- system-config-promote-image-uwsgi-base-3.11-bookworm
- system-config-promote-image-uwsgi-base-3.12-bookworm
- system-config-promote-image-python-base-3.11-trixie
- system-config-promote-image-python-base-3.11-trixie-debug
- system-config-promote-image-python-base-3.12-trixie
- system-config-promote-image-python-base-3.12-trixie-debug
- system-config-promote-image-python-builder-3.11-trixie
- system-config-promote-image-python-builder-3.12-trixie
- system-config-promote-image-uwsgi-base-3.11-trixie
- system-config-promote-image-uwsgi-base-3.12-trixie
# NOTE: infra-prod-* jobs have a hierarchy below that ensure
# they can run in parallel. We are deliberately keeping their