From 3ae6ede147b6dd8885ac5fe349fb24a196327ef5 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: May 22 2023 10:22:59 +0000
Subject: EOL - f36 branch


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index e760dd0..6267700 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 (f36 variant)"
-    run: playbooks/rpm/rpm-install-test.yaml
-    branches:
-      - f36
-    nodeset: fedora-36-vm
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f36-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 (f36 variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - f36
-    nodeset: fedora-36-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f36-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 (f36 variant)"
-    branches:
-      - f36
-    nodeset: fedora-36-container
-    requires:
-      - repo
-    vars:
-      check_previous_build_enabled: true
-      rpminspect_cmd: rpminspect-fedora
-      target: f36
-
-- job:
-    name: rpm-rpminspect
-    parent: rpminspect
     description: "Run the rpminspect report tests (epel8 variant)"
     branches:
       - epel8
@@ -312,7 +263,6 @@
       - rawhide
       - f38
       - f37
-      - f36
       - epel8
       - epel9
       - main
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 202c247..4fc0570 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -9,7 +9,7 @@
 - nodeset:
     name: fedora-38-container
     nodes:
-      - label: zuul-worker-f38
+      - label: zuul-worker-f37
         name: container
 
 - nodeset:
diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index 8f4c049..ed6831a 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -12,8 +12,6 @@
             voting: false
         - rpm-scratch-build-i686:
             voting: false
-        - rpm-scratch-build-armv7hl:
-            voting: false
         - rpm-scratch-build-aarch64:
             voting: false