diff --git a/docker/matrix-eavesdrop/Dockerfile b/docker/matrix-eavesdrop/Dockerfile index 52cee9a7e5..92cc5e48c4 100644 --- a/docker/matrix-eavesdrop/Dockerfile +++ b/docker/matrix-eavesdrop/Dockerfile @@ -14,13 +14,11 @@ # limitations under the License. FROM docker.io/opendevorg/python-builder:3.9 as builder -RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list COPY src /tmp/src RUN assemble FROM docker.io/opendevorg/python-base:3.9 as eavesdrop -RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list COPY --from=builder /output/ /output RUN /output/install-from-bindep \ diff --git a/docker/python-base/Dockerfile b/docker/python-base/Dockerfile index 3c246aca07..c4100afc41 100644 --- a/docker/python-base/Dockerfile +++ b/docker/python-base/Dockerfile @@ -16,14 +16,18 @@ # Comment to force rebuilds Tue Aug 3 19:59:32 UTC 2021 ARG PYTHON_VERSION=3.7 -FROM docker.io/library/python:${PYTHON_VERSION}-slim-buster +ARG DEBIAN_VERSION=buster +FROM docker.io/library/python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} +# Necessary to use this var in the RUN below +ARG DEBIAN_VERSION RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends RUN apt-get update \ && apt-get install -y dumb-init \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION}-backports main" >> /etc/apt/sources.list # Upgrade pip to fix wheel cache for locally built wheels. # See https://github.com/pypa/pip/issues/6852 diff --git a/docker/python-builder/Dockerfile b/docker/python-builder/Dockerfile index e03aee6df8..e7f6bb5f69 100644 --- a/docker/python-builder/Dockerfile +++ b/docker/python-builder/Dockerfile @@ -16,7 +16,8 @@ # Comment to force rebuilds Tue Aug 3 19:59:32 UTC 2021 ARG PYTHON_VERSION=3.7 -FROM docker.io/library/python:${PYTHON_VERSION}-slim-buster as fake-python +ARG DEBIAN_VERSION=buster +FROM docker.io/library/python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} as fake-python WORKDIR /tmp RUN apt-get update \ @@ -25,7 +26,9 @@ RUN apt-get update \ COPY python3-dev.control /tmp/python3-dev.control RUN equivs-build /tmp/python3-dev.control -FROM docker.io/library/python:${PYTHON_VERSION}-slim-buster +FROM docker.io/library/python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} +# Necessary to use this var in the RUN below +ARG DEBIAN_VERSION RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends @@ -36,7 +39,8 @@ COPY scripts/install-from-bindep /output/install-from-bindep RUN dpkg -i /tmp/python3-dev_4.0.0_all.deb \ && rm /tmp/python3-dev_4.0.0_all.deb \ && pip install --no-cache-dir bindep \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION}-backports main" >> /etc/apt/sources.list # Upgrade pip to fix wheel cache for locally built wheels # See https://github.com/pypa/pip/issues/6852 diff --git a/zuul.d/docker-images/accessbot.yaml b/zuul.d/docker-images/accessbot.yaml index 84c138de6c..ce4c1e6037 100644 --- a/zuul.d/docker-images/accessbot.yaml +++ b/zuul.d/docker-images/accessbot.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-accessbot description: Build a accessbot image. parent: system-config-build-image - requires: python-base-3.7-container-image + requires: python-base-3.7-buster-container-image provides: accessbot-container-image vars: &accessbot_vars docker_images: @@ -17,7 +17,7 @@ name: system-config-upload-image-accessbot description: Build and upload a accessbot image. parent: system-config-upload-image - requires: python-base-3.7-container-image + requires: python-base-3.7-buster-container-image provides: accessbot-container-image vars: *accessbot_vars files: *accessbot_files diff --git a/zuul.d/docker-images/eavesdrop.yaml b/zuul.d/docker-images/eavesdrop.yaml index 946687d188..de2ceea857 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.9-container-image - - python-builder-3.9-container-image + - python-base-3.9-buster-container-image + - python-builder-3.9-buster-container-image provides: matrix-eavesdrop-container-image vars: &matrix-eavesdrop_vars docker_images: diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index b19f09eff9..9013171c79 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -6,7 +6,7 @@ required-projects: &gerrit_base_projects - opendev/jeepyb - opendev/system-config - requires: python-builder-3.7-container-image + requires: python-builder-3.7-buster-container-image provides: gerrit-base-container-image pre-run: &gerrit-base_prerun - playbooks/zuul/gerrit/base.yaml @@ -24,7 +24,7 @@ name: system-config-upload-image-gerrit-base description: Build and upload a gerrit-base image. parent: system-config-upload-image - requires: python-builder-3.7-container-image + requires: python-builder-3.7-buster-container-image provides: gerrit-base-container-image pre-run: *gerrit-base_prerun required-projects: *gerrit_base_projects @@ -318,7 +318,7 @@ - system-config-build-image-gerrit-base: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.7 + - name: system-config-build-image-python-builder-3.7-buster soft: true - system-config-build-image-gerrit-3.2: dependencies: @@ -341,7 +341,7 @@ - system-config-upload-image-gerrit-base: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-builder-3.7 + - name: system-config-upload-image-python-builder-3.7-buster soft: true - system-config-upload-image-gerrit-3.2: dependencies: diff --git a/zuul.d/docker-images/haproxy.yaml b/zuul.d/docker-images/haproxy.yaml index bbdd95d4fd..aa5b28bbc5 100644 --- a/zuul.d/docker-images/haproxy.yaml +++ b/zuul.d/docker-images/haproxy.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-haproxy-statsd description: Build a haproxy-statsd image. parent: system-config-build-image - requires: python-base-3.7-container-image + requires: python-base-3.7-buster-container-image provides: haproxy-statsd-container-image vars: &haproxy-statsd_vars docker_images: @@ -18,7 +18,7 @@ name: system-config-upload-image-haproxy-statsd description: Build and upload a haproxy-statsd image. parent: system-config-upload-image - requires: python-base-3.7-container-image + requires: python-base-3.7-buster-container-image provides: haproxy-statsd-container-image vars: *haproxy-statsd_vars files: *haproxy-statsd_files diff --git a/zuul.d/docker-images/ircbot.yaml b/zuul.d/docker-images/ircbot.yaml index 36d52fb21b..619597361c 100644 --- a/zuul.d/docker-images/ircbot.yaml +++ b/zuul.d/docker-images/ircbot.yaml @@ -4,8 +4,8 @@ description: Build a ircbot image. parent: system-config-build-image requires: &ircbot_requires - - python-base-3.9-container-image - - python-builder-3.9-container-image + - python-base-3.9-buster-container-image + - python-builder-3.9-buster-container-image provides: ircbot-container-image required-projects: &ircbot_required_projects - opendev/meetbot diff --git a/zuul.d/docker-images/jinja-init.yaml b/zuul.d/docker-images/jinja-init.yaml index 81a40dcf07..c012d298b8 100644 --- a/zuul.d/docker-images/jinja-init.yaml +++ b/zuul.d/docker-images/jinja-init.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-jinja-init description: Build a jinja-init image. parent: system-config-build-image - requires: python-base-3.7-container-image + requires: python-base-3.7-buster-container-image provides: jinja-init-container-image vars: &jinja-init_vars docker_images: @@ -18,7 +18,7 @@ name: system-config-upload-image-jinja-init description: Build and upload a jinja-init image. parent: system-config-upload-image - requires: python-base-3.7-container-image + requires: python-base-3.7-buster-container-image provides: jinja-init-container-image vars: *jinja-init_vars files: *jinja-init_files diff --git a/zuul.d/docker-images/python-3.7-bullseye.yaml b/zuul.d/docker-images/python-3.7-bullseye.yaml new file mode 100644 index 0000000000..7519995d06 --- /dev/null +++ b/zuul.d/docker-images/python-3.7-bullseye.yaml @@ -0,0 +1,129 @@ +# python-builder-3.7-bullseye jobs +- job: + name: system-config-build-image-python-builder-3.7-bullseye + description: Build a python-builder-3.7-bullseye image. + parent: system-config-build-image + provides: + - python-builder-container-image + - python-builder-3.7-bullseye-container-image + vars: &python-builder_3_7_bullseye_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.7-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.7 + - DEBIAN_VERSION=bullseye + files: &python-builder_3_7_bullseye_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.7-bullseye + description: Build and upload a python-builder-3.7-bullseye image. + parent: system-config-upload-image + provides: + - python-builder-container-image + - python-builder-3.7-bullseye-container-image + vars: *python-builder_3_7_bullseye_vars + files: *python-builder_3_7_bullseye_files + +- job: + name: system-config-promote-image-python-builder-3.7-bullseye + description: Promote a previously published python-builder-3.7-bullseye image to latest. + parent: system-config-promote-image + vars: *python-builder_3_7_bullseye_vars + files: *python-builder_3_7_bullseye_files + +- job: + name: system-config-build-image-python-base-3.7-bullseye + description: Build a python-base-3.7-bullseye image. + parent: system-config-build-image + provides: + - python-base-container-image + - python-base-3.7-container-image + vars: &python-base-3_7_bullseye_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.7-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.7 + - DEBIAN_VERSION=bullseye + files: &python-base-3_7_bullseye_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.7-bullseye + description: Build and upload a python-base-3.7-bullseye image. + parent: system-config-upload-image + provides: python-base-3.7-bullseye-container-image + vars: *python-base-3_7_bullseye_vars + files: *python-base-3_7_bullseye_files + +- job: + name: system-config-promote-image-python-base-3.7-bullseye + description: Promote a previously published python-base-3.7-bullseye image to latest. + parent: system-config-promote-image + vars: *python-base-3_7_bullseye_vars + files: *python-base-3_7_bullseye_files + +- job: + name: system-config-build-image-uwsgi-base-3.7-bullseye + description: Build a uwsgi-base-3.7-bullseye image. + parent: system-config-build-image + requires: &uwsgi-base_3_7_bullseye_requires + - python-base-3.7-bullseye-container-image + - python-builder-3.7-bullseye-container-image + provides: uwsgi-base-3.7-bullseye-container-image + dependencies: + - name: system-config-build-image-python-base-3.7-bullseye + soft: true + - name: system-config-build-image-python-builder-3.7-bullseye + soft: true + vars: &uwsgi-base_3_7_bullseye_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.7-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.7 + - DEBIAN_VERSION=bullseye + files: &uwsgi-base_3_7_bullseye_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.7-bullseye + description: Build and upload a uwsgi-base-3.7-bullseye image. + parent: system-config-upload-image + provides: uwsgi-base-3.7-bullseye-container-image + requires: *uwsgi-base_3_7_bullseye_requires + dependencies: + - name: system-config-upload-image-python-base-3.7-bullseye + soft: true + - name: system-config-upload-image-python-builder-3.7-bullseye + soft: true + vars: *uwsgi-base_3_7_bullseye_vars + files: *uwsgi-base_3_7_bullseye_files + +- job: + name: system-config-promote-image-uwsgi-base-3.7-bullseye + description: Promote a previously published uwsgi-base-3.7-bullseye image to latest. + parent: system-config-promote-image + vars: *uwsgi-base_3_7_bullseye_vars + files: *uwsgi-base_3_7_bullseye_files diff --git a/zuul.d/docker-images/python-3.7-buster.yaml b/zuul.d/docker-images/python-3.7-buster.yaml new file mode 100644 index 0000000000..922448f722 --- /dev/null +++ b/zuul.d/docker-images/python-3.7-buster.yaml @@ -0,0 +1,135 @@ +# python-builder-3.7-buster jobs +- job: + name: system-config-build-image-python-builder-3.7-buster + description: Build a python-builder-3.7-buster image. + parent: system-config-build-image + provides: + - python-builder-container-image + - python-builder-3.7-buster-container-image + vars: &python-builder_3_7_buster_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.7 + - 3.7-buster + - latest + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.7 + - DEBIAN_VERSION=buster + files: &python-builder_3_7_buster_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.7-buster + description: Build and upload a python-builder-3.7-buster image. + parent: system-config-upload-image + provides: + - python-builder-container-image + - python-builder-3.7-buster-container-image + vars: *python-builder_3_7_buster_vars + files: *python-builder_3_7_buster_files + +- job: + name: system-config-promote-image-python-builder-3.7-buster + description: Promote a previously published python-builder-3.7-buster image to latest. + parent: system-config-promote-image + vars: *python-builder_3_7_buster_vars + files: *python-builder_3_7_buster_files + +- job: + name: system-config-build-image-python-base-3.7-buster + description: Build a python-base-3.7-buster image. + parent: system-config-build-image + provides: + - python-base-container-image + - python-base-3.7-container-image + vars: &python-base-3_7_buster_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.7 + - 3.7-buster + - latest + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.7 + - DEBIAN_VERSION=buster + files: &python-base-3_7_buster_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.7-buster + description: Build and upload a python-base-3.7-buster image. + parent: system-config-upload-image + provides: python-base-3.7-buster-container-image + vars: *python-base-3_7_buster_vars + files: *python-base-3_7_buster_files + +- job: + name: system-config-promote-image-python-base-3.7-buster + description: Promote a previously published python-base-3.7-buster image to latest. + parent: system-config-promote-image + vars: *python-base-3_7_buster_vars + files: *python-base-3_7_buster_files + +- job: + name: system-config-build-image-uwsgi-base-3.7-buster + description: Build a uwsgi-base-3.7-buster image. + parent: system-config-build-image + requires: &uwsgi-base_3_7_buster_requires + - python-base-3.7-buster-container-image + - python-builder-3.7-buster-container-image + provides: uwsgi-base-3.7-buster-container-image + dependencies: + - name: system-config-build-image-python-base-3.7-buster + soft: true + - name: system-config-build-image-python-builder-3.7-buster + soft: true + vars: &uwsgi-base_3_7_buster_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.7 + - 3.7-buster + - latest + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.7 + - DEBIAN_VERSION=buster + files: &uwsgi-base_3_7_buster_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.7-buster + description: Build and upload a uwsgi-base-3.7-buster image. + parent: system-config-upload-image + provides: uwsgi-base-3.7-buster-container-image + requires: *uwsgi-base_3_7_buster_requires + dependencies: + - name: system-config-upload-image-python-base-3.7-buster + soft: true + - name: system-config-upload-image-python-builder-3.7-buster + soft: true + vars: *uwsgi-base_3_7_buster_vars + files: *uwsgi-base_3_7_buster_files + +- job: + name: system-config-promote-image-uwsgi-base-3.7-buster + description: Promote a previously published uwsgi-base-3.7-buster image to latest. + parent: system-config-promote-image + vars: *uwsgi-base_3_7_buster_vars + files: *uwsgi-base_3_7_buster_files diff --git a/zuul.d/docker-images/python-3.7.yaml b/zuul.d/docker-images/python-3.7.yaml deleted file mode 100644 index 4baa6bd7c4..0000000000 --- a/zuul.d/docker-images/python-3.7.yaml +++ /dev/null @@ -1,129 +0,0 @@ -# python-builder-3.7 jobs -- job: - name: system-config-build-image-python-builder-3.7 - description: Build a python-builder-3.7 image. - parent: system-config-build-image - provides: - - python-builder-container-image - - python-builder-3.7-container-image - vars: &python-builder_3_7_vars - docker_images: - - context: docker/python-builder - repository: opendevorg/python-builder - tags: - - 3.7 - - latest - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.7 - files: &python-builder_3_7_files - - docker/python-base/ - - docker/python-builder/ - -- job: - name: system-config-upload-image-python-builder-3.7 - description: Build and upload a python-builder-3.7 image. - parent: system-config-upload-image - provides: - - python-builder-container-image - - python-builder-3.7-container-image - vars: *python-builder_3_7_vars - files: *python-builder_3_7_files - -- job: - name: system-config-promote-image-python-builder-3.7 - description: Promote a previously published python-builder-3.7 image to latest. - parent: system-config-promote-image - vars: *python-builder_3_7_vars - files: *python-builder_3_7_files - -- job: - name: system-config-build-image-python-base-3.7 - description: Build a python-base-3.7 image. - parent: system-config-build-image - provides: - - python-base-container-image - - python-base-3.7-container-image - vars: &python-base-3_7_vars - docker_images: - - context: docker/python-base - repository: opendevorg/python-base - tags: - - 3.7 - - latest - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.7 - files: &python-base-3_7_files - - docker/python-base/ - - docker/python-builder/ - -- job: - name: system-config-upload-image-python-base-3.7 - description: Build and upload a python-base-3.7 image. - parent: system-config-upload-image - provides: python-base-3.7-container-image - vars: *python-base-3_7_vars - files: *python-base-3_7_files - -- job: - name: system-config-promote-image-python-base-3.7 - description: Promote a previously published python-base-3.7 image to latest. - parent: system-config-promote-image - vars: *python-base-3_7_vars - files: *python-base-3_7_files - -- job: - name: system-config-build-image-uwsgi-base-3.7 - description: Build a uwsgi-base-3.7 image. - parent: system-config-build-image - requires: &uwsgi-base_3_7_requires - - python-base-3.7-container-image - - python-builder-3.7-container-image - provides: uwsgi-base-3.7-container-image - dependencies: - - name: system-config-build-image-python-base-3.7 - soft: true - - name: system-config-build-image-python-builder-3.7 - soft: true - vars: &uwsgi-base_3_7_vars - docker_images: - - context: docker/uwsgi-base - repository: opendevorg/uwsgi-base - tags: - - 3.7 - - latest - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.7 - files: &uwsgi-base_3_7_files - - docker/python-base/.* - - docker/python-builder/.* - - docker/uwsgi-base/.* - -- job: - name: system-config-upload-image-uwsgi-base-3.7 - description: Build and upload a uwsgi-base-3.7 image. - parent: system-config-upload-image - provides: uwsgi-base-3.7-container-image - requires: *uwsgi-base_3_7_requires - dependencies: - - name: system-config-upload-image-python-base-3.7 - soft: true - - name: system-config-upload-image-python-builder-3.7 - soft: true - vars: *uwsgi-base_3_7_vars - files: *uwsgi-base_3_7_files - -- job: - name: system-config-promote-image-uwsgi-base-3.7 - description: Promote a previously published uwsgi-base-3.7 image to latest. - parent: system-config-promote-image - vars: *uwsgi-base_3_7_vars - files: *uwsgi-base_3_7_files diff --git a/zuul.d/docker-images/python-3.8-bullseye.yaml b/zuul.d/docker-images/python-3.8-bullseye.yaml new file mode 100644 index 0000000000..52bb0b5135 --- /dev/null +++ b/zuul.d/docker-images/python-3.8-bullseye.yaml @@ -0,0 +1,129 @@ +# python-builder-3.8-bullseye jobs +- job: + name: system-config-build-image-python-builder-3.8-bullseye + description: Build a python-builder-3.8-bullseye image. + parent: system-config-build-image + provides: + - python-builder-container-image + - python-builder-3.8-bullseye-container-image + vars: &python-builder_3_8_bullseye_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.8-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.8 + - DEBIAN_VERSION=bullseye + files: &python-builder_3_8_bullseye_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.8-bullseye + description: Build and upload a python-builder-3.8-bullseye image. + parent: system-config-upload-image + provides: + - python-builder-container-image + - python-builder-3.8-bullseye-container-image + vars: *python-builder_3_8_bullseye_vars + files: *python-builder_3_8_bullseye_files + +- job: + name: system-config-promote-image-python-builder-3.8-bullseye + description: Promote a previously published python-builder-3.8-bullseye image to latest. + parent: system-config-promote-image + vars: *python-builder_3_8_bullseye_vars + files: *python-builder_3_8_bullseye_files + +- job: + name: system-config-build-image-python-base-3.8-bullseye + description: Build a python-base-3.8-bullseye image. + parent: system-config-build-image + provides: + - python-base-container-image + - python-base-3.8-container-image + vars: &python-base-3_8_bullseye_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.8-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.8 + - DEBIAN_VERSION=bullseye + files: &python-base-3_8_bullseye_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.8-bullseye + description: Build and upload a python-base-3.8-bullseye image. + parent: system-config-upload-image + provides: python-base-3.8-bullseye-container-image + vars: *python-base-3_8_bullseye_vars + files: *python-base-3_8_bullseye_files + +- job: + name: system-config-promote-image-python-base-3.8-bullseye + description: Promote a previously published python-base-3.8-bullseye image to latest. + parent: system-config-promote-image + vars: *python-base-3_8_bullseye_vars + files: *python-base-3_8_bullseye_files + +- job: + name: system-config-build-image-uwsgi-base-3.8-bullseye + description: Build a uwsgi-base-3.8-bullseye image. + parent: system-config-build-image + requires: &uwsgi-base_3_8_bullseye_requires + - python-base-3.8-bullseye-container-image + - python-builder-3.8-bullseye-container-image + provides: uwsgi-base-3.8-bullseye-container-image + dependencies: + - name: system-config-build-image-python-base-3.8-bullseye + soft: true + - name: system-config-build-image-python-builder-3.8-bullseye + soft: true + vars: &uwsgi-base_3_8_bullseye_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.8-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.8 + - DEBIAN_VERSION=bullseye + files: &uwsgi-base_3_8_bullseye_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.8-bullseye + description: Build and upload a uwsgi-base-3.8-bullseye image. + parent: system-config-upload-image + provides: uwsgi-base-3.8-bullseye-container-image + requires: *uwsgi-base_3_8_bullseye_requires + dependencies: + - name: system-config-upload-image-python-base-3.8-bullseye + soft: true + - name: system-config-upload-image-python-builder-3.8-bullseye + soft: true + vars: *uwsgi-base_3_8_bullseye_vars + files: *uwsgi-base_3_8_bullseye_files + +- job: + name: system-config-promote-image-uwsgi-base-3.8-bullseye + description: Promote a previously published uwsgi-base-3.8-bullseye image to latest. + parent: system-config-promote-image + vars: *uwsgi-base_3_8_bullseye_vars + files: *uwsgi-base_3_8_bullseye_files diff --git a/zuul.d/docker-images/python-3.8-buster.yaml b/zuul.d/docker-images/python-3.8-buster.yaml new file mode 100644 index 0000000000..38b099369a --- /dev/null +++ b/zuul.d/docker-images/python-3.8-buster.yaml @@ -0,0 +1,132 @@ +# python-builder-3.8-buster jobs +- job: + name: system-config-build-image-python-builder-3.8-buster + description: Build a python-builder-3.8-buster image. + parent: system-config-build-image + provides: + - python-builder-container-image + - python-builder-3.8-buster-container-image + vars: &python-builder_3_8_buster_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.8 + - 3.8-buster + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.8 + - DEBIAN_VERSION=buster + files: &python-builder_3_8_buster_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.8-buster + description: Build and upload a python-builder-3.8-buster image. + parent: system-config-upload-image + provides: + - python-builder-container-image + - python-builder-3.8-buster-container-image + vars: *python-builder_3_8_buster_vars + files: *python-builder_3_8_buster_files + +- job: + name: system-config-promote-image-python-builder-3.8-buster + description: Promote a previously published python-builder-3.8-buster image. + parent: system-config-promote-image + vars: *python-builder_3_8_buster_vars + files: *python-builder_3_8_buster_files + +- job: + name: system-config-build-image-python-base-3.8-buster + description: Build a python-base-3.8-buster image. + parent: system-config-build-image + provides: + - python-base-container-image + - python-base-3.8-container-image + vars: &python-base-3_8_buster_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.8 + - 3.8-buster + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.8 + - DEBIAN_VERSION=buster + files: &python-base-3_8_buster_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.8-buster + description: Build and upload a python-base-3.8-buster image. + parent: system-config-upload-image + provides: python-base-3.8-buster-container-image + vars: *python-base-3_8_buster_vars + files: *python-base-3_8_buster_files + +- job: + name: system-config-promote-image-python-base-3.8-buster + description: Promote a previously published python-base-3.8-buster image. + parent: system-config-promote-image + vars: *python-base-3_8_buster_vars + files: *python-base-3_8_buster_files + +- job: + name: system-config-build-image-uwsgi-base-3.8-buster + description: Build a uwsgi-base-3.8-buster image. + parent: system-config-build-image + requires: &uwsgi-base_3_8_buster_requires + - python-base-3.8-buster-container-image + - python-builder-3.8-buster-container-image + provides: uwsgi-base-3.8-buster-container-image + dependencies: + - name: system-config-build-image-python-base-3.8-buster + soft: true + - name: system-config-build-image-python-builder-3.8-buster + soft: true + vars: &uwsgi-base_3_8_buster_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.8 + - 3.8-buster + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.8 + - DEBIAN_VERSION=buster + files: &uwsgi-base_3_8_buster_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.8-buster + description: Build and upload a uwsgi-base-3.8-buster image. + parent: system-config-upload-image + provides: uwsgi-base-3.8-buster-container-image + requires: *uwsgi-base_3_8_buster_requires + dependencies: + - name: system-config-upload-image-python-base-3.8-buster + soft: true + - name: system-config-upload-image-python-builder-3.8-buster + soft: true + vars: *uwsgi-base_3_8_buster_vars + files: *uwsgi-base_3_8_buster_files + +- job: + name: system-config-promote-image-uwsgi-base-3.8-buster + description: Promote a previously published uwsgi-base-3.8-buster image. + parent: system-config-promote-image + vars: *uwsgi-base_3_8_buster_vars + files: *uwsgi-base_3_8_buster_files diff --git a/zuul.d/docker-images/python-3.8.yaml b/zuul.d/docker-images/python-3.8.yaml deleted file mode 100644 index c237e943a6..0000000000 --- a/zuul.d/docker-images/python-3.8.yaml +++ /dev/null @@ -1,120 +0,0 @@ -- job: - name: system-config-build-image-python-builder-3.8 - description: Build a python-builder-3.8 image. - parent: system-config-build-image - provides: - - python-builder-3.8-container-image - vars: &python-builder_3_8_vars - docker_images: - - context: docker/python-builder - repository: opendevorg/python-builder - tags: - - 3.8 - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.8 - files: &python-builder_3_8_files - - docker/python-base/ - - docker/python-builder/ - -- job: - name: system-config-upload-image-python-builder-3.8 - description: Build and upload a python-builder-3.8 image. - parent: system-config-upload-image - provides: python-builder-3.8-container-image - vars: *python-builder_3_8_vars - files: *python-builder_3_8_files - -- job: - name: system-config-promote-image-python-builder-3.8 - description: Promote a previously published python-builder-3.8 image to latest. - parent: system-config-promote-image - vars: *python-builder_3_8_vars - files: *python-builder_3_8_files - -- job: - name: system-config-build-image-python-base-3.8 - description: Build a python-base-3.8 image. - parent: system-config-build-image - provides: python-base-3.8-container-image - vars: &python-base-3_8_vars - docker_images: - - context: docker/python-base - repository: opendevorg/python-base - tags: - - 3.8 - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.8 - files: &python-base-3_8_files - - docker/python-base/ - - docker/python-builder/ - -- job: - name: system-config-upload-image-python-base-3.8 - description: Build and upload a python-base-3.8 image. - parent: system-config-upload-image - provides: python-base-3.8-container-image - vars: *python-base-3_8_vars - files: *python-base-3_8_files - -- job: - name: system-config-promote-image-python-base-3.8 - description: Promote a previously published python-base-3.8 image to latest. - parent: system-config-promote-image - vars: *python-base-3_8_vars - files: *python-base-3_8_files - -- job: - name: system-config-build-image-uwsgi-base-3.8 - description: Build a uwsgi-base-3.8 image. - parent: system-config-build-image - provides: uwsgi-base-3.8-container-image - requires: &uwsgi-base_3_8_requires - - python-base-3.8-container-image - - python-builder-3.8-container-image - dependencies: - - name: system-config-build-image-python-base-3.8 - soft: true - - name: system-config-build-image-python-builder-3.8 - soft: true - vars: &uwsgi-base_3_8_vars - docker_images: - - context: docker/uwsgi-base - repository: opendevorg/uwsgi-base - tags: - - 3.8 - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.8 - files: &uwsgi-base_3_8_files - - docker/python-base/.* - - docker/python-builder/.* - - docker/uwsgi-base/.* - -- job: - name: system-config-upload-image-uwsgi-base-3.8 - description: Build and upload a uwsgi-base-3.8 image. - parent: system-config-upload-image - provides: uwsgi-base-3.8-container-image - requires: *uwsgi-base_3_8_requires - dependencies: - - name: system-config-upload-image-python-base-3.8 - soft: true - - name: system-config-upload-image-python-builder-3.8 - soft: true - vars: *uwsgi-base_3_8_vars - files: *uwsgi-base_3_8_files - -- job: - name: system-config-promote-image-uwsgi-base-3.8 - description: Promote a previously published uwsgi-base-3.8 image to latest. - parent: system-config-promote-image - vars: *uwsgi-base_3_8_vars - files: *uwsgi-base_3_8_files diff --git a/zuul.d/docker-images/python-3.9-bullseye.yaml b/zuul.d/docker-images/python-3.9-bullseye.yaml new file mode 100644 index 0000000000..0c59e6d5ca --- /dev/null +++ b/zuul.d/docker-images/python-3.9-bullseye.yaml @@ -0,0 +1,129 @@ +# python-builder-3.9-bullseye jobs +- job: + name: system-config-build-image-python-builder-3.9-bullseye + description: Build a python-builder-3.9-bullseye image. + parent: system-config-build-image + provides: + - python-builder-container-image + - python-builder-3.9-bullseye-container-image + vars: &python-builder_3_9_bullseye_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.9-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=bullseye + files: &python-builder_3_9_bullseye_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.9-bullseye + description: Build and upload a python-builder-3.9-bullseye image. + parent: system-config-upload-image + provides: + - python-builder-container-image + - python-builder-3.9-bullseye-container-image + vars: *python-builder_3_9_bullseye_vars + files: *python-builder_3_9_bullseye_files + +- job: + name: system-config-promote-image-python-builder-3.9-bullseye + description: Promote a previously published python-builder-3.9-bullseye image to latest. + parent: system-config-promote-image + vars: *python-builder_3_9_bullseye_vars + files: *python-builder_3_9_bullseye_files + +- job: + name: system-config-build-image-python-base-3.9-bullseye + description: Build a python-base-3.9-bullseye image. + parent: system-config-build-image + provides: + - python-base-container-image + - python-base-3.9-container-image + vars: &python-base-3_9_bullseye_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.9-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=bullseye + files: &python-base-3_9_bullseye_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.9-bullseye + description: Build and upload a python-base-3.9-bullseye image. + parent: system-config-upload-image + provides: python-base-3.9-bullseye-container-image + vars: *python-base-3_9_bullseye_vars + files: *python-base-3_9_bullseye_files + +- job: + name: system-config-promote-image-python-base-3.9-bullseye + description: Promote a previously published python-base-3.9-bullseye image to latest. + parent: system-config-promote-image + vars: *python-base-3_9_bullseye_vars + files: *python-base-3_9_bullseye_files + +- job: + name: system-config-build-image-uwsgi-base-3.9-bullseye + description: Build a uwsgi-base-3.9-bullseye image. + parent: system-config-build-image + requires: &uwsgi-base_3_9_bullseye_requires + - python-base-3.9-bullseye-container-image + - python-builder-3.9-bullseye-container-image + provides: uwsgi-base-3.9-bullseye-container-image + dependencies: + - name: system-config-build-image-python-base-3.9-bullseye + soft: true + - name: system-config-build-image-python-builder-3.9-bullseye + soft: true + vars: &uwsgi-base_3_9_bullseye_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.9-bullseye + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=bullseye + files: &uwsgi-base_3_9_bullseye_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.9-bullseye + description: Build and upload a uwsgi-base-3.9-bullseye image. + parent: system-config-upload-image + provides: uwsgi-base-3.9-bullseye-container-image + requires: *uwsgi-base_3_9_bullseye_requires + dependencies: + - name: system-config-upload-image-python-base-3.9-bullseye + soft: true + - name: system-config-upload-image-python-builder-3.9-bullseye + soft: true + vars: *uwsgi-base_3_9_bullseye_vars + files: *uwsgi-base_3_9_bullseye_files + +- job: + name: system-config-promote-image-uwsgi-base-3.9-bullseye + description: Promote a previously published uwsgi-base-3.9-bullseye image to latest. + parent: system-config-promote-image + vars: *uwsgi-base_3_9_bullseye_vars + files: *uwsgi-base_3_9_bullseye_files diff --git a/zuul.d/docker-images/python-3.9-buster.yaml b/zuul.d/docker-images/python-3.9-buster.yaml new file mode 100644 index 0000000000..20643685ab --- /dev/null +++ b/zuul.d/docker-images/python-3.9-buster.yaml @@ -0,0 +1,132 @@ +# python-builder-3.9-buster jobs +- job: + name: system-config-build-image-python-builder-3.9-buster + description: Build a python-builder-3.9-buster image. + parent: system-config-build-image + provides: + - python-builder-container-image + - python-builder-3.9-buster-container-image + vars: &python-builder_3_9_buster_vars + docker_images: + - context: docker/python-builder + repository: opendevorg/python-builder + tags: + - 3.9 + - 3.9-buster + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=buster + files: &python-builder_3_9_buster_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-builder-3.9-buster + description: Build and upload a python-builder-3.9-buster image. + parent: system-config-upload-image + provides: + - python-builder-container-image + - python-builder-3.9-buster-container-image + vars: *python-builder_3_9_buster_vars + files: *python-builder_3_9_buster_files + +- job: + name: system-config-promote-image-python-builder-3.9-buster + description: Promote a previously published python-builder-3.9-buster image. + parent: system-config-promote-image + vars: *python-builder_3_9_buster_vars + files: *python-builder_3_9_buster_files + +- job: + name: system-config-build-image-python-base-3.9-buster + description: Build a python-base-3.9-buster image. + parent: system-config-build-image + provides: + - python-base-container-image + - python-base-3.9-container-image + vars: &python-base-3_9_buster_vars + docker_images: + - context: docker/python-base + repository: opendevorg/python-base + tags: + - 3.9 + - 3.9-buster + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=buster + files: &python-base-3_9_buster_files + - docker/python-base/ + - docker/python-builder/ + +- job: + name: system-config-upload-image-python-base-3.9-buster + description: Build and upload a python-base-3.9-buster image. + parent: system-config-upload-image + provides: python-base-3.9-buster-container-image + vars: *python-base-3_9_buster_vars + files: *python-base-3_9_buster_files + +- job: + name: system-config-promote-image-python-base-3.9-buster + description: Promote a previously published python-base-3.9-buster image. + parent: system-config-promote-image + vars: *python-base-3_9_buster_vars + files: *python-base-3_9_buster_files + +- job: + name: system-config-build-image-uwsgi-base-3.9-buster + description: Build a uwsgi-base-3.9-buster image. + parent: system-config-build-image + requires: &uwsgi-base_3_9_buster_requires + - python-base-3.9-buster-container-image + - python-builder-3.9-buster-container-image + provides: uwsgi-base-3.9-buster-container-image + dependencies: + - name: system-config-build-image-python-base-3.9-buster + soft: true + - name: system-config-build-image-python-builder-3.9-buster + soft: true + vars: &uwsgi-base_3_9_buster_vars + docker_images: + - context: docker/uwsgi-base + repository: opendevorg/uwsgi-base + tags: + - 3.9 + - 3.9-buster + arch: + - linux/amd64 + - linux/arm64 + build_args: + - PYTHON_VERSION=3.9 + - DEBIAN_VERSION=buster + files: &uwsgi-base_3_9_buster_files + - docker/python-base/.* + - docker/python-builder/.* + - docker/uwsgi-base/.* + +- job: + name: system-config-upload-image-uwsgi-base-3.9-buster + description: Build and upload a uwsgi-base-3.9-buster image. + parent: system-config-upload-image + provides: uwsgi-base-3.9-buster-container-image + requires: *uwsgi-base_3_9_buster_requires + dependencies: + - name: system-config-upload-image-python-base-3.9-buster + soft: true + - name: system-config-upload-image-python-builder-3.9-buster + soft: true + vars: *uwsgi-base_3_9_buster_vars + files: *uwsgi-base_3_9_buster_files + +- job: + name: system-config-promote-image-uwsgi-base-3.9-buster + description: Promote a previously published uwsgi-base-3.9-buster image. + parent: system-config-promote-image + vars: *uwsgi-base_3_9_buster_vars + files: *uwsgi-base_3_9_buster_files diff --git a/zuul.d/docker-images/python-3.9.yaml b/zuul.d/docker-images/python-3.9.yaml deleted file mode 100644 index af838bc18d..0000000000 --- a/zuul.d/docker-images/python-3.9.yaml +++ /dev/null @@ -1,120 +0,0 @@ -- job: - name: system-config-build-image-python-builder-3.9 - description: Build a python-builder-3.9 image. - parent: system-config-build-image - provides: - - python-builder-3.9-container-image - vars: &python-builder_3_9_vars - docker_images: - - context: docker/python-builder - repository: opendevorg/python-builder - tags: - - 3.9 - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.9 - files: &python-builder_3_9_files - - docker/python-base/ - - docker/python-builder/ - -- job: - name: system-config-upload-image-python-builder-3.9 - description: Build and upload a python-builder-3.9 image. - parent: system-config-upload-image - provides: python-builder-3.9-container-image - vars: *python-builder_3_9_vars - files: *python-builder_3_9_files - -- job: - name: system-config-promote-image-python-builder-3.9 - description: Promote a previously published python-builder-3.9 image to latest. - parent: system-config-promote-image - vars: *python-builder_3_9_vars - files: *python-builder_3_9_files - -- job: - name: system-config-build-image-python-base-3.9 - description: Build a python-base-3.9 image. - parent: system-config-build-image - provides: python-base-3.9-container-image - vars: &python-base-3_9_vars - docker_images: - - context: docker/python-base - repository: opendevorg/python-base - tags: - - 3.9 - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.9 - files: &python-base-3_9_files - - docker/python-base/ - - docker/python-builder/ - -- job: - name: system-config-upload-image-python-base-3.9 - description: Build and upload a python-base-3.9 image. - parent: system-config-upload-image - provides: python-base-3.9-container-image - vars: *python-base-3_9_vars - files: *python-base-3_9_files - -- job: - name: system-config-promote-image-python-base-3.9 - description: Promote a previously published python-base-3.9 image to latest. - parent: system-config-promote-image - vars: *python-base-3_9_vars - files: *python-base-3_9_files - -- job: - name: system-config-build-image-uwsgi-base-3.9 - description: Build a uwsgi-base-3.9 image. - parent: system-config-build-image - provides: uwsgi-base-3.9-container-image - requires: &uwsgi-base_3_9_requires - - python-base-3.9-container-image - - python-builder-3.9-container-image - dependencies: - - name: system-config-build-image-python-base-3.9 - soft: true - - name: system-config-build-image-python-builder-3.9 - soft: true - vars: &uwsgi-base_3_9_vars - docker_images: - - context: docker/uwsgi-base - repository: opendevorg/uwsgi-base - tags: - - 3.9 - arch: - - linux/amd64 - - linux/arm64 - build_args: - - PYTHON_VERSION=3.9 - files: &uwsgi-base_3_9_files - - docker/python-base/.* - - docker/python-builder/.* - - docker/uwsgi-base/.* - -- job: - name: system-config-upload-image-uwsgi-base-3.9 - description: Build and upload a uwsgi-base-3.9 image. - parent: system-config-upload-image - provides: uwsgi-base-3.9-container-image - requires: *uwsgi-base_3_9_requires - dependencies: - - name: system-config-upload-image-python-base-3.9 - soft: true - - name: system-config-upload-image-python-builder-3.9 - soft: true - vars: *uwsgi-base_3_9_vars - files: *uwsgi-base_3_9_files - -- job: - name: system-config-promote-image-uwsgi-base-3.9 - description: Promote a previously published uwsgi-base-3.9 image to latest. - parent: system-config-promote-image - vars: *uwsgi-base_3_9_vars - files: *uwsgi-base_3_9_files diff --git a/zuul.d/docker-images/zookeeper-statsd.yaml b/zuul.d/docker-images/zookeeper-statsd.yaml index 2efdd3e910..e2cee6a886 100644 --- a/zuul.d/docker-images/zookeeper-statsd.yaml +++ b/zuul.d/docker-images/zookeeper-statsd.yaml @@ -3,7 +3,7 @@ name: system-config-build-image-zookeeper-statsd description: Build a zookeeper-statsd image. parent: system-config-build-image - requires: python-base-3.7-container-image + requires: python-base-3.7-buster-container-image vars: &zookeeper-statsd_vars docker_images: - context: docker/zookeeper-statsd @@ -16,7 +16,7 @@ name: system-config-upload-image-zookeeper-statsd description: Build and upload a zookeeper-statsd image. parent: system-config-upload-image - requires: python-base-3.7-container-image + requires: python-base-3.7-buster-container-image vars: *zookeeper-statsd_vars files: *zookeeper-statsd_files diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index bbc92531b1..944fa828e1 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -99,7 +99,7 @@ - system-config-build-image-jinja-init: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.7 + - name: system-config-build-image-python-base-3.7-buster soft: true - system-config-build-image-gitea-init: dependencies: @@ -117,37 +117,46 @@ - system-config-build-image-haproxy-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.7 + - name: system-config-build-image-python-base-3.7-buster soft: true - system-config-build-image-zookeeper-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.7 + - name: system-config-build-image-python-base-3.7-buster soft: true - system-config-build-image-accessbot: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.7 + - name: system-config-build-image-python-base-3.7-buster soft: true - system-config-build-image-ircbot: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.9 + - name: system-config-build-image-python-builder-3.9-buster soft: true - system-config-build-image-matrix-eavesdrop: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.9 + - name: system-config-build-image-python-builder-3.9-buster soft: true - - system-config-build-image-python-base-3.7 - - system-config-build-image-python-base-3.8 - - system-config-build-image-python-base-3.9 - - system-config-build-image-python-builder-3.7 - - system-config-build-image-python-builder-3.8 - - system-config-build-image-python-builder-3.9 - - system-config-build-image-uwsgi-base-3.7 - - system-config-build-image-uwsgi-base-3.8 - - system-config-build-image-uwsgi-base-3.9 + - system-config-build-image-python-base-3.7-buster + - system-config-build-image-python-base-3.8-buster + - system-config-build-image-python-base-3.9-buster + - system-config-build-image-python-builder-3.7-buster + - system-config-build-image-python-builder-3.8-buster + - system-config-build-image-python-builder-3.9-buster + - system-config-build-image-uwsgi-base-3.7-buster + - system-config-build-image-uwsgi-base-3.8-buster + - system-config-build-image-uwsgi-base-3.9-buster + - system-config-build-image-python-base-3.7-bullseye + - system-config-build-image-python-base-3.8-bullseye + - system-config-build-image-python-base-3.9-bullseye + - system-config-build-image-python-builder-3.7-bullseye + - system-config-build-image-python-builder-3.8-bullseye + - system-config-build-image-python-builder-3.9-bullseye + - system-config-build-image-uwsgi-base-3.7-bullseye + - system-config-build-image-uwsgi-base-3.8-bullseye + - system-config-build-image-uwsgi-base-3.9-bullseye check-arm64: jobs: - system-config-run-base-arm64 @@ -237,7 +246,7 @@ - system-config-upload-image-jinja-init: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-base-3.7 + - name: system-config-upload-image-python-base-3.7-buster soft: true - system-config-upload-image-gitea-init: dependencies: @@ -252,37 +261,46 @@ - system-config-upload-image-haproxy-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-base-3.7 + - name: system-config-upload-image-python-base-3.7-buster soft: true - system-config-upload-image-zookeeper-statsd: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-python-base-3.7 + - name: system-config-upload-image-python-base-3.7-buster soft: true - system-config-upload-image-accessbot: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-base-3.7 + - name: system-config-upload-image-python-base-3.7-buster soft: true - system-config-upload-image-ircbot: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.9 + - name: system-config-upload-image-python-builder-3.9-buster soft: true - system-config-upload-image-matrix-eavesdrop: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.9 + - name: system-config-upload-image-python-builder-3.9-buster soft: true - - system-config-upload-image-python-base-3.7 - - system-config-upload-image-python-base-3.8 - - system-config-upload-image-python-base-3.9 - - system-config-upload-image-python-builder-3.7 - - system-config-upload-image-python-builder-3.8 - - system-config-upload-image-python-builder-3.9 - - system-config-upload-image-uwsgi-base-3.7 - - system-config-upload-image-uwsgi-base-3.8 - - system-config-upload-image-uwsgi-base-3.9 + - system-config-upload-image-python-base-3.7-buster + - system-config-upload-image-python-base-3.8-buster + - system-config-upload-image-python-base-3.9-buster + - system-config-upload-image-python-builder-3.7-buster + - system-config-upload-image-python-builder-3.8-buster + - system-config-upload-image-python-builder-3.9-buster + - system-config-upload-image-uwsgi-base-3.7-buster + - system-config-upload-image-uwsgi-base-3.8-buster + - system-config-upload-image-uwsgi-base-3.9-buster + - system-config-upload-image-python-base-3.7-bullseye + - system-config-upload-image-python-base-3.8-bullseye + - system-config-upload-image-python-base-3.9-bullseye + - system-config-upload-image-python-builder-3.7-bullseye + - system-config-upload-image-python-builder-3.8-bullseye + - system-config-upload-image-python-builder-3.9-bullseye + - system-config-upload-image-uwsgi-base-3.7-bullseye + - system-config-upload-image-uwsgi-base-3.8-bullseye + - system-config-upload-image-uwsgi-base-3.9-bullseye promote: jobs: - opendev-promote-docs @@ -300,15 +318,24 @@ - system-config-promote-image-refstack - system-config-promote-image-ircbot - system-config-promote-image-matrix-eavesdrop - - system-config-promote-image-python-base-3.7 - - system-config-promote-image-python-base-3.8 - - system-config-promote-image-python-base-3.9 - - system-config-promote-image-python-builder-3.7 - - system-config-promote-image-python-builder-3.8 - - system-config-promote-image-python-builder-3.9 - - system-config-promote-image-uwsgi-base-3.7 - - system-config-promote-image-uwsgi-base-3.8 - - system-config-promote-image-uwsgi-base-3.9 + - system-config-promote-image-python-base-3.7-buster + - system-config-promote-image-python-base-3.8-buster + - system-config-promote-image-python-base-3.9-buster + - system-config-promote-image-python-builder-3.7-buster + - system-config-promote-image-python-builder-3.8-buster + - system-config-promote-image-python-builder-3.9-buster + - system-config-promote-image-uwsgi-base-3.7-buster + - system-config-promote-image-uwsgi-base-3.8-buster + - system-config-promote-image-uwsgi-base-3.9-buster + - system-config-promote-image-python-base-3.7-bullseye + - system-config-promote-image-python-base-3.8-bullseye + - system-config-promote-image-python-base-3.9-bullseye + - system-config-promote-image-python-builder-3.7-bullseye + - system-config-promote-image-python-builder-3.8-bullseye + - system-config-promote-image-python-builder-3.9-bullseye + - system-config-promote-image-uwsgi-base-3.7-bullseye + - system-config-promote-image-uwsgi-base-3.8-bullseye + - system-config-promote-image-uwsgi-base-3.9-bullseye - infra-prod-install-ansible - infra-prod-base - infra-prod-letsencrypt