From dd58c496f8a8609b3d77898ed508e620db2b3d19 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 8 Nov 2021 15:19:38 +1100 Subject: [PATCH] Remove Fedora 34 The dependent changes should be the last references to Fedora 34 nodes Depends-On: https://review.opendev.org/c/openstack/devstack/+/827576 Depends-On: https://review.opendev.org/c/openstack/devstack/+/827578 Depends-On: https://review.opendev.org/c/zuul/nodepool/+/827577 Change-Id: Ie14ea374808e5518588925de3a476f0bc6ff2ccf --- nodepool/nl01.opendev.org.yaml | 10 ---------- nodepool/nl02.opendev.org.yaml | 19 ------------------- nodepool/nl03.opendev.org.yaml | 16 ---------------- nodepool/nl04.opendev.org.yaml | 9 --------- nodepool/nodepool.yaml | 11 ----------- 5 files changed, 65 deletions(-) diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index 2451f01667..7c07f2fe1a 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -25,8 +25,6 @@ labels: min-ready: 1 - name: debian-buster min-ready: 1 - - name: fedora-34 - min-ready: 0 - name: fedora-35 min-ready: 1 - name: gentoo-17-0-systemd @@ -61,8 +59,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-34 - config-drive: true - name: fedora-35 config-drive: true - name: gentoo-17-0-systemd @@ -106,11 +102,6 @@ providers: flavor-name: 'Performance' diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-34 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: fedora-34 - key-name: infra-root-keys-2020-05-13 - name: fedora-35 min-ram: 8000 flavor-name: 'Performance' @@ -177,7 +168,6 @@ diskimages: - name: centos-9-stream - name: debian-bullseye - name: debian-buster - - name: fedora-34 - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index 8c2b9f9aa1..ad42cea55c 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -20,7 +20,6 @@ labels: - name: centos-9-stream - name: debian-bullseye - name: debian-buster - - name: fedora-34 - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -71,8 +70,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-34 - config-drive: true - name: fedora-35 config-drive: true - name: gentoo-17-0-systemd @@ -114,11 +111,6 @@ providers: flavor-name: 'nodepool.0' diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-34 - min-ram: 8000 - flavor-name: 'nodepool.0' - diskimage: fedora-34 - key-name: infra-root-keys-2020-05-13 - name: fedora-35 min-ram: 8000 flavor-name: 'nodepool.0' @@ -218,11 +210,6 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-34 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: fedora-34 - key-name: infra-root-keys-2020-05-13 - name: fedora-35 min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -307,11 +294,6 @@ providers: flavor-name: 'opendev-zuul' diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-34 - min-ram: 8000 - flavor-name: 'opendev-zuul' - diskimage: fedora-34 - key-name: infra-root-keys-2020-05-13 - name: fedora-35 min-ram: 8000 flavor-name: 'opendev-zuul' @@ -354,7 +336,6 @@ diskimages: - name: centos-9-stream - name: debian-bullseye - name: debian-buster - - name: fedora-34 - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index d37efab3a5..5224654980 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -29,7 +29,6 @@ labels: - name: debian-buster - name: debian-buster-arm64 min-ready: 0 - - name: fedora-34 - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -89,8 +88,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-34 - config-drive: true - name: fedora-35 config-drive: true - name: gentoo-17-0-systemd @@ -132,11 +129,6 @@ providers: flavor-name: 'A1.8' diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-34 - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: fedora-34 - key-name: infra-root-keys-2020-05-13 - name: fedora-35 min-ram: 8000 flavor-name: 'A1.8' @@ -272,13 +264,6 @@ providers: volume-size: 80 diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-34 - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: fedora-34 - key-name: infra-root-keys-2020-05-13 - name: fedora-35 min-ram: 8000 flavor-name: v2-highcpu-8 @@ -482,7 +467,6 @@ diskimages: - name: debian-bullseye-arm64 - name: debian-buster - name: debian-buster-arm64 - - name: fedora-34 - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index 3a716ac320..9416e2bd7c 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -20,7 +20,6 @@ labels: - name: centos-9-stream - name: debian-bullseye - name: debian-buster - - name: fedora-34 - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -56,8 +55,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-34 - config-drive: true - name: fedora-35 config-drive: true - name: gentoo-17-0-systemd @@ -99,11 +96,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-34 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: fedora-34 - key-name: infra-root-keys-2020-05-13 - name: fedora-35 min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -178,7 +170,6 @@ diskimages: - name: centos-9-stream - name: debian-bullseye - name: debian-buster - - name: fedora-34 - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 5a24e65082..6e83086921 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -27,8 +27,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-34 - config-drive: true - name: fedora-35 config-drive: true - name: gentoo-17-0-systemd @@ -170,15 +168,6 @@ diskimages: env-vars: DIB_EPEL_DISABLED: '1' - - name: fedora-34 - parent: base - pause: false - python-path: /usr/bin/python3 - elements: - - fedora-container - - cache-devstack - release: 34 - - name: fedora-35 parent: base pause: false