From f5570fee889051b89bdda5c3592c7fb68a2c5392 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: Jan 26 2023 10:56:51 +0000
Subject: Remove EOL Fedora nodesets


Those nodesets uses Fedora distro, which is End of Life and
should not be in use anymore.

---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 51184b1..647d3f8 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -51,22 +51,6 @@
 
 - job:
     name: rpm-install-test
-    description: "Install the built rpms (f35 variant)"
-    run: playbooks/rpm/rpm-install-test.yaml
-    branches:
-      - f35
-    nodeset: fedora-35-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/
-
-- job:
-    name: rpm-install-test
     description: "Install the built rpms (epel8 variant)"
     run: playbooks/rpm/rpm-install-test.yaml
     pre-run:
@@ -161,25 +145,6 @@
 
 - job:
     name: rpm-test
-    description: "Install the built rpms and run STI tests (f35 variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - f35
-    nodeset: fedora-35-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/
-
-- job:
-    name: rpm-test
     description: "Install the built rpms and run STI tests (epel8 variant)"
     run: playbooks/rpm/rpmtest.yaml
     pre-run:
@@ -266,20 +231,6 @@
 - job:
     name: rpm-rpminspect
     parent: rpminspect
-    description: "Run the rpminspect report tests (f35 variant)"
-    branches:
-      - f35
-    nodeset: fedora-36-container
-    requires:
-      - repo
-    vars:
-      check_previous_build_enabled: true
-      rpminspect_cmd: rpminspect-fedora
-      target: f35
-
-- job:
-    name: rpm-rpminspect
-    parent: rpminspect
     description: "Run the rpminspect report tests (epel8 variant)"
     branches:
       - epel8
@@ -312,7 +263,6 @@
       - rawhide
       - f37
       - f36
-      - f35
       - epel8
       - epel9
       - main
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index caeceb9..14eadca 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -19,42 +19,6 @@
         name: container
 
 - nodeset:
-    name: fedora-35-container
-    nodes:
-      - label: zuul-worker-f35
-        name: container
-
-- nodeset:
-    name: fedora-34-container
-    nodes:
-      - label: zuul-worker-f34
-        name: container
-
-- nodeset:
-    name: fedora-33-container
-    nodes:
-      - label: pod-fedora-33
-        name: container
-
-- nodeset:
-    name: fedora-32-container
-    nodes:
-      - label: pod-fedora-32
-        name: container
-
-- nodeset:
-    name: fedora-31-container
-    nodes:
-      - label: pod-fedora-31
-        name: container
-
-- nodeset:
-    name: fedora-30-container
-    nodes:
-      - label: pod-fedora-30
-        name: container
-
-- nodeset:
     name: centos-8-container
     nodes:
       - label: pod-centos-8
@@ -91,42 +55,6 @@
         name: cloud-host
 
 - nodeset:
-    name: fedora-35-vm
-    nodes:
-      - label: cloud-fedora-35-small
-        name: cloud-host
-
-- nodeset:
-    name: fedora-34-vm
-    nodes:
-      - label: cloud-fedora-34-small
-        name: cloud-host
-
-- nodeset:
-    name: fedora-33-vm
-    nodes:
-      - label: cloud-fedora-33-small
-        name: cloud-host
-
-- nodeset:
-    name: fedora-32-vm
-    nodes:
-      - label: cloud-fedora-32-small
-        name: cloud-host
-
-- nodeset:
-    name: fedora-31-vm
-    nodes:
-      - label: cloud-fedora-31-small
-        name: cloud-host
-
-- nodeset:
-    name: fedora-30-vm
-    nodes:
-      - label: cloud-fedora-30-small
-        name: cloud-host
-
-- nodeset:
     name: fedora-rawhide-vm-medium
     nodes:
       - label: cloud-fedora-rawhide-medium
@@ -151,42 +79,6 @@
         name: cloud-host
 
 - nodeset:
-    name: fedora-35-vm-medium
-    nodes:
-      - label: cloud-fedora-35-medium
-        name: cloud-host
-
-- nodeset:
-    name: fedora-34-vm-medium
-    nodes:
-      - label: cloud-fedora-34-medium
-        name: cloud-host
-
-- nodeset:
-    name: fedora-33-vm-medium
-    nodes:
-      - label: cloud-fedora-33-medium
-        name: cloud-host
-
-- nodeset:
-    name: fedora-32-vm-medium
-    nodes:
-      - label: cloud-fedora-32-medium
-        name: cloud-host
-
-- nodeset:
-    name: fedora-31-vm-medium
-    nodes:
-      - label: cloud-fedora-31-medium
-        name: cloud-host
-
-- nodeset:
-    name: fedora-30-vm-medium
-    nodes:
-      - label: cloud-fedora-30-medium
-        name: cloud-host
-
-- nodeset:
     name: centos-8-vm
     nodes:
       - label: cloud-centos-8-stream