From b8c53b9c034da70956cbe21198d0217876cdec4a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 13 Mar 2024 08:21:46 -0700 Subject: [PATCH] Remove centos-7 image uploads from Nodepool This removal of centos-7 image uploads should cause Nodepool to clean up the existing images in the clouds. Once that is done we can completely remove the image builds in a followup change. We are performing this cleanup because CentOS 7 is near its EOL and cleaning it up will create room on nodepool builders and our mirrors for other more modern test platforms. Depends-On: https://review.opendev.org/c/opendev/base-jobs/+/912786 Change-Id: I48f6845bc7c97e0a8feb75fc0d540bdbe067e769 --- nodepool/nl01.opendev.org.yaml | 9 --------- nodepool/nl02.opendev.org.yaml | 16 ---------------- nodepool/nl03.opendev.org.yaml | 31 ------------------------------- nodepool/nl04.opendev.org.yaml | 15 --------------- nodepool/nodepool.yaml | 4 ---- 5 files changed, 75 deletions(-) diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index 75a91bd7ac..772d9192a3 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -15,8 +15,6 @@ zookeeper-servers: # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, # another launcher will need to assume this logic. labels: - - name: centos-7 - min-ready: 0 - name: centos-8-stream min-ready: 1 - name: centos-9-stream @@ -51,8 +49,6 @@ providers: launch-timeout: 600 rate: 0.001 diskimages: &provider_diskimages - - name: centos-7 - config-drive: true - name: centos-8-stream config-drive: true - name: centos-9-stream @@ -81,11 +77,6 @@ providers: - name: main max-servers: 140 labels: &provider_pools_labels - - name: centos-7 - min-ram: 8192 - flavor-name: 'Performance' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - name: centos-8-stream min-ram: 8192 flavor-name: 'Performance' diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index 27345cb378..8ba24aa237 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -15,7 +15,6 @@ zookeeper-servers: # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, # another launcher will need to assume this logic. labels: - - name: centos-7 - name: centos-8-stream - name: centos-9-stream - name: debian-bookworm @@ -28,8 +27,6 @@ labels: - name: ubuntu-jammy - name: ubuntu-xenial - name: openEuler-22-03-LTS - - name: centos-7-expanded - min-ready: 0 - name: ubuntu-bionic-expanded min-ready: 0 - name: ubuntu-bionic-32GB @@ -38,10 +35,6 @@ labels: min-ready: 0 - name: multi-numa-ubuntu-bionic-expanded min-ready: 0 - - name: multi-numa-centos-7 - min-ready: 0 - - name: multi-numa-centos-7-expanded - min-ready: 0 - name: nested-virt-debian-bookworm min-ready: 0 - name: nested-virt-debian-bullseye @@ -52,8 +45,6 @@ labels: min-ready: 0 - name: nested-virt-ubuntu-jammy min-ready: 0 - - name: nested-virt-centos-7 - min-ready: 0 - name: nested-virt-centos-8-stream min-ready: 0 - name: nested-virt-centos-9-stream @@ -69,8 +60,6 @@ providers: launch-timeout: 300 rate: 0.01 diskimages: &provider_diskimages - - name: centos-7 - config-drive: true - name: centos-8-stream config-drive: true - name: centos-9-stream @@ -99,11 +88,6 @@ providers: - name: main max-servers: 51 labels: - - name: centos-7 - min-ram: 8000 - flavor-name: 'opendev-zuul' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - name: centos-8-stream min-ram: 8000 flavor-name: 'opendev-zuul' diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 3dbd30bb40..3668f8a330 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -19,7 +19,6 @@ zookeeper-servers: # e.g. *-arm64 labels: # x86_64 - - name: centos-7 - name: centos-8-stream - name: centos-9-stream - name: debian-bookworm @@ -74,8 +73,6 @@ labels: min-ready: 0 - name: ubuntu-jammy-32GB min-ready: 0 - - name: centos-7-gpu - min-ready: 0 - name: ubuntu-xenial-gpu min-ready: 0 - name: ubuntu-bionic-gpu @@ -90,8 +87,6 @@ labels: min-ready: 0 - name: nested-virt-ubuntu-jammy min-ready: 0 - - name: nested-virt-centos-7 - min-ready: 0 - name: nested-virt-centos-8-stream min-ready: 0 - name: nested-virt-centos-9-stream @@ -106,8 +101,6 @@ providers: boot-timeout: 120 rate: 0.001 diskimages: &provider_diskimages - - name: centos-7 - config-drive: true - name: centos-8-stream config-drive: true - name: centos-9-stream @@ -161,11 +154,6 @@ providers: flavor-name: 'v3-standard-8' diskimage: ubuntu-jammy key-name: infra-root-keys-2020-05-13 - - name: nested-virt-centos-7 - min-ram: 8000 - flavor-name: 'v3-standard-8' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic-32GB flavor-name: 'v3-standard-8' # 8c, 32g diskimage: ubuntu-bionic @@ -192,11 +180,6 @@ providers: - name: gpu max-servers: 2 labels: - - name: centos-7-gpu - min-ram: 8000 - flavor-name: 'v2-gpu-6' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - name: ubuntu-xenial-gpu min-ram: 8000 flavor-name: 'v2-gpu-6' @@ -218,13 +201,6 @@ providers: - name: main max-servers: 0 labels: - - name: centos-7 - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - name: centos-8-stream min-ram: 8000 flavor-name: v2-highcpu-8 @@ -330,13 +306,6 @@ providers: volume-size: 80 diskimage: ubuntu-jammy key-name: infra-root-keys-2020-05-13 - - name: nested-virt-centos-7 - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - name: nested-virt-centos-8-stream min-ram: 8000 flavor-name: v2-highcpu-8 diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index 7e930989cb..a86c34518a 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -15,7 +15,6 @@ zookeeper-servers: # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, # another launcher will need to assume this logic. labels: - - name: centos-7 - name: centos-8-stream - name: centos-9-stream - name: debian-bookworm @@ -38,8 +37,6 @@ labels: min-ready: 0 - name: nested-virt-ubuntu-jammy min-ready: 0 - - name: nested-virt-centos-7 - min-ready: 0 - name: nested-virt-centos-8-stream min-ready: 0 - name: nested-virt-centos-9-stream @@ -55,8 +52,6 @@ providers: launch-timeout: 600 rate: 0.1 diskimages: &provider_diskimages - - name: centos-7 - config-drive: true - name: centos-8-stream config-drive: true - name: centos-9-stream @@ -85,11 +80,6 @@ providers: - name: main max-servers: 120 labels: &provider_pools_labels - - name: centos-7 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - name: centos-8-stream min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -175,11 +165,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: ubuntu-jammy key-name: infra-root-keys-2020-05-13 - - name: nested-virt-centos-7 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - name: nested-virt-centos-8-stream min-ram: 8000 flavor-name: ssd-osFoundation-3 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 08878b5435..2b7b762a76 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -19,8 +19,6 @@ providers: # 6 hours image-upload-timeout: 21600 diskimages: &provider_diskimages - - name: centos-7 - config-drive: true - name: centos-8-stream config-drive: true - name: centos-9-stream @@ -69,8 +67,6 @@ providers: # 6 hours image-upload-timeout: 21600 diskimages: - - name: centos-7 - config-drive: true - name: centos-8-stream config-drive: true - name: centos-9-stream