From 3b9c5d2f07d135688fcb1bf8141e001ad7eb73b1 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 6 Sep 2023 09:16:34 -0700
Subject: [PATCH] Remove fedora image builds

This removes the fedora image builds from nodepool. At this point
Nodepool should no longer have any knowledge of fedora.

There is potential for other cleanups for things like dib elements, but
leaving those in place doesn't hurt much.

Change-Id: I3e6984bc060e9d21f7ad851f3a64db8bb555b38a
---
 nodepool/nb04.opendev.org.yaml |  6 ------
 nodepool/nl01.opendev.org.yaml |  2 --
 nodepool/nl02.opendev.org.yaml |  2 --
 nodepool/nl03.opendev.org.yaml |  2 --
 nodepool/nl04.opendev.org.yaml |  2 --
 nodepool/nodepool.yaml         | 18 ------------------
 6 files changed, 32 deletions(-)

diff --git a/nodepool/nb04.opendev.org.yaml b/nodepool/nb04.opendev.org.yaml
index ce2c13456e..7cc7c15714 100644
--- a/nodepool/nb04.opendev.org.yaml
+++ b/nodepool/nb04.opendev.org.yaml
@@ -156,12 +156,6 @@ diskimages:
   - name: rockylinux-9
     elements: []
 
-  - name: fedora-35
-    elements: []
-
-  - name: fedora-36
-    elements: []
-
   ############ Debian #############
 
   - name: debian-bookworm
diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml
index 2fcdf031c0..d75577b5a8 100644
--- a/nodepool/nl01.opendev.org.yaml
+++ b/nodepool/nl01.opendev.org.yaml
@@ -203,8 +203,6 @@ diskimages:
   - name: debian-bookworm
   - name: debian-bullseye
   - name: debian-buster
-  - name: fedora-35
-  - name: fedora-36
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: rockylinux-8
diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml
index b6ff80c7e0..abf14cf667 100644
--- a/nodepool/nl02.opendev.org.yaml
+++ b/nodepool/nl02.opendev.org.yaml
@@ -176,8 +176,6 @@ diskimages:
   - name: debian-bookworm
   - name: debian-bullseye
   - name: debian-buster
-  - name: fedora-35
-  - name: fedora-36
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: rockylinux-8
diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml
index 3c5f85cd09..3590646bf2 100644
--- a/nodepool/nl03.opendev.org.yaml
+++ b/nodepool/nl03.opendev.org.yaml
@@ -535,8 +535,6 @@ diskimages:
   - name: debian-bullseye-arm64
   - name: debian-buster
   - name: debian-buster-arm64
-  - name: fedora-35
-  - name: fedora-36
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: rockylinux-8
diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml
index f5a444a4d6..1d64605ded 100644
--- a/nodepool/nl04.opendev.org.yaml
+++ b/nodepool/nl04.opendev.org.yaml
@@ -224,8 +224,6 @@ diskimages:
   - name: debian-bookworm
   - name: debian-bullseye
   - name: debian-buster
-  - name: fedora-35
-  - name: fedora-36
   - name: gentoo-17-0-systemd
   - name: opensuse-15
   - name: rockylinux-8
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 72900f8bde..9ee23a0207 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -214,24 +214,6 @@ diskimages:
     env-vars:
       DIB_EPEL_DISABLED: '1'
 
-  - name: fedora-35
-    parent: base
-    pause: false
-    python-path: /usr/bin/python3
-    elements:
-      - fedora-container
-      - cache-devstack
-    release: 35
-
-  - name: fedora-36
-    parent: base
-    pause: false
-    python-path: /usr/bin/python3
-    elements:
-      - fedora-container
-      - cache-devstack
-    release: 36
-
   ############ Debian #############
 
   - name: debian-bookworm