From 78999b020edc92e2bb9a6cd2026296b37755761d Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 18 Apr 2022 12:58:50 -0700 Subject: [PATCH] Remove our buster python images We've moved onto bullseye for just about everything at this point. It is possible there are stragglers and the removal of these jobs should flag them if their dependencies and requirements are set properly. Otherwise they'll continue to pull the historical builds on docker hub. Either way we'll either shake them out or they will continue until they can move to bullseye. We remove these in preparation for adding python3.10 images which don't make sense for buster and our total image catalog is getting large enough that successfully building and promoting this entire set is getting problematic. A bit of spring cleaning on what we can commit to before we commit to some new stuff. Depends-On: https://review.opendev.org/c/opendev/gear/+/838402 Depends-On: https://review.opendev.org/c/opendev/storyboard/+/838403 Change-Id: I58c4d314ca4f4be3f1e17ec267a4c324cabf0c2a --- docker/uwsgi-base/bindep.txt | 3 +- zuul.d/docker-images/python-3.7-buster.yaml | 135 -------------------- zuul.d/docker-images/python-3.8-buster.yaml | 132 ------------------- zuul.d/docker-images/python-3.9-buster.yaml | 132 ------------------- zuul.d/project.yaml | 27 ---- 5 files changed, 1 insertion(+), 428 deletions(-) delete mode 100644 zuul.d/docker-images/python-3.7-buster.yaml delete mode 100644 zuul.d/docker-images/python-3.8-buster.yaml delete mode 100644 zuul.d/docker-images/python-3.9-buster.yaml diff --git a/docker/uwsgi-base/bindep.txt b/docker/uwsgi-base/bindep.txt index ba01cbbda5..db53d4bea3 100644 --- a/docker/uwsgi-base/bindep.txt +++ b/docker/uwsgi-base/bindep.txt @@ -1,6 +1,5 @@ gcc [compile] libc6-dev [compile] libffi-dev [compile platform:dpkg] -libffi7 [platform:dpkg !platform:ubuntu-bionic !platform:debian-buster] -libffi6 [platform:ubuntu-bionic platform:debian-buster] +libffi7 [platform:dpkg] libssl-dev [compile platform:dpkg] diff --git a/zuul.d/docker-images/python-3.7-buster.yaml b/zuul.d/docker-images/python-3.7-buster.yaml deleted file mode 100644 index 922448f722..0000000000 --- a/zuul.d/docker-images/python-3.7-buster.yaml +++ /dev/null @@ -1,135 +0,0 @@ -# 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.8-buster.yaml b/zuul.d/docker-images/python-3.8-buster.yaml deleted file mode 100644 index 38b099369a..0000000000 --- a/zuul.d/docker-images/python-3.8-buster.yaml +++ /dev/null @@ -1,132 +0,0 @@ -# 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.9-buster.yaml b/zuul.d/docker-images/python-3.9-buster.yaml deleted file mode 100644 index 20643685ab..0000000000 --- a/zuul.d/docker-images/python-3.9-buster.yaml +++ /dev/null @@ -1,132 +0,0 @@ -# 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/project.yaml b/zuul.d/project.yaml index 59bab7f950..230cdc266d 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -142,15 +142,6 @@ - name: opendev-buildset-registry - name: system-config-build-image-python-builder-3.9-bullseye soft: true - - 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 @@ -289,15 +280,6 @@ - name: opendev-buildset-registry - name: system-config-upload-image-python-builder-3.9-bullseye soft: true - - 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 @@ -324,15 +306,6 @@ - system-config-promote-image-refstack - system-config-promote-image-ircbot - system-config-promote-image-matrix-eavesdrop - - 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