diff --git a/docker/uwsgi-base/bindep.txt b/docker/uwsgi-base/bindep.txt index db53d4bea3..57b36d6002 100644 --- a/docker/uwsgi-base/bindep.txt +++ b/docker/uwsgi-base/bindep.txt @@ -1,5 +1,6 @@ gcc [compile] libc6-dev [compile] libffi-dev [compile platform:dpkg] -libffi7 [platform:dpkg] libssl-dev [compile platform:dpkg] +libffi7 [platform:debian-bullseye] +libffi8 [platform:debian-bookworm] diff --git a/zuul.d/docker-images/python-3.10-bookworm.yaml b/zuul.d/docker-images/python-3.10-bookworm.yaml new file mode 100644 index 0000000000..52bd5f28f4 --- /dev/null +++ b/zuul.d/docker-images/python-3.10-bookworm.yaml @@ -0,0 +1,135 @@ +# python-builder-3.10-bookworm jobs +- job: + name: system-config-build-image-python-builder-3.10-bookworm + description: Build a python-builder-3.10-bookworm image. + parent: system-config-build-image + timeout: 3600 + provides: + - python-builder-container-image + - python-builder-3.10-bookworm-container-image + vars: &python-builder_3_10_bookworm_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.10-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.10 + - DEBIAN_VERSION=bookworm + files: &python-builder_3_10_bookworm_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.10-bookworm + description: Build and upload a python-builder-3.10-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: + - python-builder-container-image + - python-builder-3.10-bookworm-container-image + vars: *python-builder_3_10_bookworm_vars + files: *python-builder_3_10_bookworm_files + +- job: + name: system-config-promote-image-python-builder-3.10-bookworm + description: Promote a previously published python-builder-3.10-bookworm image to latest. + parent: system-config-promote-image + vars: *python-builder_3_10_bookworm_vars + files: *python-builder_3_10_bookworm_files + +- job: + name: system-config-build-image-python-base-3.10-bookworm + description: Build a python-base-3.10-bookworm image. + parent: system-config-build-image + timeout: 3600 + provides: + - python-base-container-image + - python-base-3.10-bookworm-container-image + vars: &python-base_3_10_bookworm_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.10-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.10 + - DEBIAN_VERSION=bookworm + files: &python-base_3_10_bookworm_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.10-bookworm + description: Build and upload a python-base-3.10-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: python-base-3.10-bookworm-container-image + vars: *python-base_3_10_bookworm_vars + files: *python-base_3_10_bookworm_files + +- job: + name: system-config-promote-image-python-base-3.10-bookworm + description: Promote a previously published python-base-3.10-bookworm image to latest. + parent: system-config-promote-image + vars: *python-base_3_10_bookworm_vars + files: *python-base_3_10_bookworm_files + +- job: + name: system-config-build-image-uwsgi-base-3.10-bookworm + description: Build a uwsgi-base-3.10-bookworm image. + parent: system-config-build-image + timeout: 3600 + requires: &uwsgi-base_3_10_bookworm_requires + - python-base-3.10-bookworm-container-image + - python-builder-3.10-bookworm-container-image + provides: uwsgi-base-3.10-bookworm-container-image + dependencies: + - name: system-config-build-image-python-base-3.10-bookworm + soft: true + - name: system-config-build-image-python-builder-3.10-bookworm + soft: true + vars: &uwsgi-base_3_10_bookworm_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.10-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.10 + - DEBIAN_VERSION=bookworm + files: &uwsgi-base_3_10_bookworm_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.10-bookworm + description: Build and upload a uwsgi-base-3.10-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: uwsgi-base-3.10-bookworm-container-image + requires: *uwsgi-base_3_10_bookworm_requires + dependencies: + - name: system-config-upload-image-python-base-3.10-bookworm + soft: true + - name: system-config-upload-image-python-builder-3.10-bookworm + soft: true + vars: *uwsgi-base_3_10_bookworm_vars + files: *uwsgi-base_3_10_bookworm_files + +- job: + name: system-config-promote-image-uwsgi-base-3.10-bookworm + description: Promote a previously published uwsgi-base-3.10-bookworm image to latest. + parent: system-config-promote-image + vars: *uwsgi-base_3_10_bookworm_vars + files: *uwsgi-base_3_10_bookworm_files diff --git a/zuul.d/docker-images/python-3.11-bookworm.yaml b/zuul.d/docker-images/python-3.11-bookworm.yaml new file mode 100644 index 0000000000..1c89fbb69d --- /dev/null +++ b/zuul.d/docker-images/python-3.11-bookworm.yaml @@ -0,0 +1,135 @@ +# python-builder-3.11-bookworm jobs +- job: + name: system-config-build-image-python-builder-3.11-bookworm + description: Build a python-builder-3.11-bookworm image. + parent: system-config-build-image + timeout: 3600 + provides: + - python-builder-container-image + - python-builder-3.11-bookworm-container-image + vars: &python-builder_3_11_bookworm_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.11-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.11 + - DEBIAN_VERSION=bookworm + files: &python-builder_3_11_bookworm_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.11-bookworm + description: Build and upload a python-builder-3.11-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: + - python-builder-container-image + - python-builder-3.11-bookworm-container-image + vars: *python-builder_3_11_bookworm_vars + files: *python-builder_3_11_bookworm_files + +- job: + name: system-config-promote-image-python-builder-3.11-bookworm + description: Promote a previously published python-builder-3.11-bookworm image to latest. + parent: system-config-promote-image + vars: *python-builder_3_11_bookworm_vars + files: *python-builder_3_11_bookworm_files + +- job: + name: system-config-build-image-python-base-3.11-bookworm + description: Build a python-base-3.11-bookworm image. + parent: system-config-build-image + timeout: 3600 + provides: + - python-base-container-image + - python-base-3.11-bookworm-container-image + vars: &python-base_3_11_bookworm_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.11-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.11 + - DEBIAN_VERSION=bookworm + files: &python-base_3_11_bookworm_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.11-bookworm + description: Build and upload a python-base-3.11-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: python-base-3.11-bookworm-container-image + vars: *python-base_3_11_bookworm_vars + files: *python-base_3_11_bookworm_files + +- job: + name: system-config-promote-image-python-base-3.11-bookworm + description: Promote a previously published python-base-3.11-bookworm image to latest. + parent: system-config-promote-image + vars: *python-base_3_11_bookworm_vars + files: *python-base_3_11_bookworm_files + +- job: + name: system-config-build-image-uwsgi-base-3.11-bookworm + description: Build a uwsgi-base-3.11-bookworm image. + parent: system-config-build-image + timeout: 3600 + requires: &uwsgi-base_3_11_bookworm_requires + - python-base-3.11-bookworm-container-image + - python-builder-3.11-bookworm-container-image + provides: uwsgi-base-3.11-bookworm-container-image + dependencies: + - name: system-config-build-image-python-base-3.11-bookworm + soft: true + - name: system-config-build-image-python-builder-3.11-bookworm + soft: true + vars: &uwsgi-base_3_11_bookworm_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.11-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.11 + - DEBIAN_VERSION=bookworm + files: &uwsgi-base_3_11_bookworm_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.11-bookworm + description: Build and upload a uwsgi-base-3.11-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: uwsgi-base-3.11-bookworm-container-image + requires: *uwsgi-base_3_11_bookworm_requires + dependencies: + - name: system-config-upload-image-python-base-3.11-bookworm + soft: true + - name: system-config-upload-image-python-builder-3.11-bookworm + soft: true + vars: *uwsgi-base_3_11_bookworm_vars + files: *uwsgi-base_3_11_bookworm_files + +- job: + name: system-config-promote-image-uwsgi-base-3.11-bookworm + description: Promote a previously published uwsgi-base-3.11-bookworm image to latest. + parent: system-config-promote-image + vars: *uwsgi-base_3_11_bookworm_vars + files: *uwsgi-base_3_11_bookworm_files diff --git a/zuul.d/docker-images/python-3.9-bookworm.yaml b/zuul.d/docker-images/python-3.9-bookworm.yaml new file mode 100644 index 0000000000..d92d0135fb --- /dev/null +++ b/zuul.d/docker-images/python-3.9-bookworm.yaml @@ -0,0 +1,135 @@ +# python-builder-3.9-bookworm jobs +- job: + name: system-config-build-image-python-builder-3.9-bookworm + description: Build a python-builder-3.9-bookworm image. + parent: system-config-build-image + timeout: 3600 + provides: + - python-builder-container-image + - python-builder-3.9-bookworm-container-image + vars: &python-builder_3_9_bookworm_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.9-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=bookworm + files: &python-builder_3_9_bookworm_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.9-bookworm + description: Build and upload a python-builder-3.9-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: + - python-builder-container-image + - python-builder-3.9-bookworm-container-image + vars: *python-builder_3_9_bookworm_vars + files: *python-builder_3_9_bookworm_files + +- job: + name: system-config-promote-image-python-builder-3.9-bookworm + description: Promote a previously published python-builder-3.9-bookworm image to latest. + parent: system-config-promote-image + vars: *python-builder_3_9_bookworm_vars + files: *python-builder_3_9_bookworm_files + +- job: + name: system-config-build-image-python-base-3.9-bookworm + description: Build a python-base-3.9-bookworm image. + parent: system-config-build-image + timeout: 3600 + provides: + - python-base-container-image + - python-base-3.9-bookworm-container-image + vars: &python-base_3_9_bookworm_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.9-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=bookworm + files: &python-base_3_9_bookworm_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.9-bookworm + description: Build and upload a python-base-3.9-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: python-base-3.9-bookworm-container-image + vars: *python-base_3_9_bookworm_vars + files: *python-base_3_9_bookworm_files + +- job: + name: system-config-promote-image-python-base-3.9-bookworm + description: Promote a previously published python-base-3.9-bookworm image to latest. + parent: system-config-promote-image + vars: *python-base_3_9_bookworm_vars + files: *python-base_3_9_bookworm_files + +- job: + name: system-config-build-image-uwsgi-base-3.9-bookworm + description: Build a uwsgi-base-3.9-bookworm image. + parent: system-config-build-image + timeout: 3600 + requires: &uwsgi-base_3_9_bookworm_requires + - python-base-3.9-bookworm-container-image + - python-builder-3.9-bookworm-container-image + provides: uwsgi-base-3.9-bookworm-container-image + dependencies: + - name: system-config-build-image-python-base-3.9-bookworm + soft: true + - name: system-config-build-image-python-builder-3.9-bookworm + soft: true + vars: &uwsgi-base_3_9_bookworm_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.9-bookworm + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=bookworm + files: &uwsgi-base_3_9_bookworm_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.9-bookworm + description: Build and upload a uwsgi-base-3.9-bookworm image. + parent: system-config-upload-image + timeout: 3600 + provides: uwsgi-base-3.9-bookworm-container-image + requires: *uwsgi-base_3_9_bookworm_requires + dependencies: + - name: system-config-upload-image-python-base-3.9-bookworm + soft: true + - name: system-config-upload-image-python-builder-3.9-bookworm + soft: true + vars: *uwsgi-base_3_9_bookworm_vars + files: *uwsgi-base_3_9_bookworm_files + +- job: + name: system-config-promote-image-uwsgi-base-3.9-bookworm + description: Promote a previously published uwsgi-base-3.9-bookworm image to latest. + parent: system-config-promote-image + vars: *uwsgi-base_3_9_bookworm_vars + files: *uwsgi-base_3_9_bookworm_files diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 899f968e8c..ede9cbfcb2 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -158,6 +158,15 @@ - system-config-build-image-uwsgi-base-3.9-bullseye - system-config-build-image-uwsgi-base-3.10-bullseye - system-config-build-image-uwsgi-base-3.11-bullseye + - system-config-build-image-python-base-3.9-bookworm + - system-config-build-image-python-base-3.10-bookworm + - system-config-build-image-python-base-3.11-bookworm + - system-config-build-image-python-builder-3.9-bookworm + - system-config-build-image-python-builder-3.10-bookworm + - system-config-build-image-python-builder-3.11-bookworm + - system-config-build-image-uwsgi-base-3.9-bookworm + - system-config-build-image-uwsgi-base-3.10-bookworm + - system-config-build-image-uwsgi-base-3.11-bookworm check-arm64: jobs: - system-config-run-base-arm64 @@ -308,6 +317,15 @@ - system-config-upload-image-uwsgi-base-3.9-bullseye - system-config-upload-image-uwsgi-base-3.10-bullseye - system-config-upload-image-uwsgi-base-3.11-bullseye + - system-config-upload-image-python-base-3.9-bookworm + - system-config-upload-image-python-base-3.10-bookworm + - system-config-upload-image-python-base-3.11-bookworm + - system-config-upload-image-python-builder-3.9-bookworm + - system-config-upload-image-python-builder-3.10-bookworm + - system-config-upload-image-python-builder-3.11-bookworm + - system-config-upload-image-uwsgi-base-3.9-bookworm + - system-config-upload-image-uwsgi-base-3.10-bookworm + - system-config-upload-image-uwsgi-base-3.11-bookworm promote: jobs: - opendev-promote-docs @@ -335,6 +353,15 @@ - system-config-promote-image-uwsgi-base-3.9-bullseye - system-config-promote-image-uwsgi-base-3.10-bullseye - system-config-promote-image-uwsgi-base-3.11-bullseye + - system-config-promote-image-python-base-3.9-bookworm + - system-config-promote-image-python-base-3.10-bookworm + - system-config-promote-image-python-base-3.11-bookworm + - system-config-promote-image-python-builder-3.9-bookworm + - system-config-promote-image-python-builder-3.10-bookworm + - system-config-promote-image-python-builder-3.11-bookworm + - system-config-promote-image-uwsgi-base-3.9-bookworm + - system-config-promote-image-uwsgi-base-3.10-bookworm + - system-config-promote-image-uwsgi-base-3.11-bookworm # NOTE: infra-prod-* jobs have a hierarchy below that ensure # they can run in parallel. We are deliberately keeping their