From 4dc053ff0fedada86bc309c6ba3823df14f8efdd Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 16 Oct 2023 13:52:07 -0700
Subject: [PATCH] Stop building python3.9 container images
Drop the python3.9 container images (python-builder, python-base,
uwsgi-base). At this point nothing is building off of these images and
we should be using python3.11 for anything new.
Note that python3.10 can be cleaned up once zuul-registry and
openstackclient stop building on top of python3.10. Everything else
appears to be python3.11 at this point.
Change-Id: Id30b616ec336a5599766fb808f55e228da686439
---
zuul.d/docker-images/python-3.9-bookworm.yaml | 138 ------------------
zuul.d/docker-images/python-3.9-bullseye.yaml | 138 ------------------
zuul.d/project.yaml | 18 ---
3 files changed, 294 deletions(-)
delete mode 100644 zuul.d/docker-images/python-3.9-bookworm.yaml
delete mode 100644 zuul.d/docker-images/python-3.9-bullseye.yaml
diff --git a/zuul.d/docker-images/python-3.9-bookworm.yaml b/zuul.d/docker-images/python-3.9-bookworm.yaml
deleted file mode 100644
index 3a52c121cd..0000000000
--- a/zuul.d/docker-images/python-3.9-bookworm.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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/
- - zuul.d/docker-images/python-3.9-bookworm.yaml
-
-- 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/
- - zuul.d/docker-images/python-3.9-bookworm.yaml
-
-- 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/
- - zuul.d/docker-images/python-3.9-bookworm.yaml
-
-- 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/docker-images/python-3.9-bullseye.yaml b/zuul.d/docker-images/python-3.9-bullseye.yaml
deleted file mode 100644
index 7f012b8805..0000000000
--- a/zuul.d/docker-images/python-3.9-bullseye.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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
- timeout: 3600
- 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/
- - zuul.d/docker-images/python-3.9-bullseye.yaml
-
-- 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
- timeout: 3600
- 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
- timeout: 3600
- provides:
- - python-base-container-image
- - python-base-3.9-bullseye-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/
- - zuul.d/docker-images/python-3.9-bullseye.yaml
-
-- 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
- timeout: 3600
- 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
- timeout: 3600
- 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/
- - zuul.d/docker-images/python-3.9-bullseye.yaml
-
-- 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
- timeout: 3600
- 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/project.yaml b/zuul.d/project.yaml
index 70e7f9533d..fdb9e7424b 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -149,23 +149,17 @@
- name: opendev-buildset-registry
- name: system-config-build-image-python-builder-3.11-bookworm
soft: true
- - system-config-build-image-python-base-3.9-bullseye
- system-config-build-image-python-base-3.10-bullseye
- system-config-build-image-python-base-3.11-bullseye
- - system-config-build-image-python-builder-3.9-bullseye
- system-config-build-image-python-builder-3.10-bullseye
- system-config-build-image-python-builder-3.11-bullseye
- - 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-base-3.11-bookworm-debug
- - 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:
@@ -309,23 +303,17 @@
- name: opendev-buildset-registry
- name: system-config-upload-image-python-builder-3.11-bookworm
soft: true
- - system-config-upload-image-python-base-3.9-bullseye
- system-config-upload-image-python-base-3.10-bullseye
- system-config-upload-image-python-base-3.11-bullseye
- - system-config-upload-image-python-builder-3.9-bullseye
- system-config-upload-image-python-builder-3.10-bullseye
- system-config-upload-image-python-builder-3.11-bullseye
- - 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-base-3.11-bookworm-debug
- - 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:
@@ -346,23 +334,17 @@
- system-config-promote-image-refstack
- system-config-promote-image-ircbot
- system-config-promote-image-matrix-eavesdrop
- - system-config-promote-image-python-base-3.9-bullseye
- system-config-promote-image-python-base-3.10-bullseye
- system-config-promote-image-python-base-3.11-bullseye
- - system-config-promote-image-python-builder-3.9-bullseye
- system-config-promote-image-python-builder-3.10-bullseye
- system-config-promote-image-python-builder-3.11-bullseye
- - 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-base-3.11-bookworm-debug
- - 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