From 2369bde46975f84df31a86dfde165ace7f2500a6 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Feb 11 2022 11:02:58 +0000
Subject: Add support for F36 branch and remobe F33


Depends-on: https://pagure.io/fedora-project-config/pull-request/177

---

diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index e9bc913..cc3a72b 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -234,9 +234,9 @@ let getTestingFarmJobVars =
         let name =
               merge
                 { Rawhide = "Fedora-Rawhide"
-                , F33 = "Fedora-33"
                 , F34 = "Fedora-34"
                 , F35 = "Fedora-35"
+                , F36 = "Fedora-36"
                 , Epel8 = "CentOS-Stream-8"
                 }
                 branch
@@ -244,9 +244,9 @@ let getTestingFarmJobVars =
         let distro =
               merge
                 { Rawhide = "fedora-rawhide"
-                , F33 = "fedora-33"
                 , F34 = "fedora-34"
                 , F35 = "fedora-35"
+                , F36 = "fedora-36"
                 , Epel8 = "centos-stream-8"
                 }
                 branch
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 797ca2b..266a0b6 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -18,9 +18,9 @@
     run: playbooks/rpm/check-for-tests.yaml
     branches:
       - rawhide
+      - f36
       - f35
       - f34
-      - f33
       - epel8
       - main
     nodeset:
@@ -32,9 +32,9 @@
     run: playbooks/rpm/check-for-sti-tests.yaml
     branches:
       - rawhide
+      - f36
       - f35
       - f34
-      - f33
       - epel8
       - main
     nodeset:
@@ -46,9 +46,9 @@
     run: playbooks/rpm/check-for-fmf-tests.yaml
     branches:
       - rawhide
+      - f36
       - f35
       - f34
-      - f33
       - epel8
       - main
     nodeset:
@@ -60,9 +60,9 @@
     run: playbooks/rpm/check-for-arches.yaml
     branches:
       - rawhide
+      - f36
       - f35
       - f34
-      - f33
       - epel8
       - main
     nodeset: fedora-34-container
@@ -189,271 +189,271 @@
     name: rpm-scratch-build
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     final: true
     provides:
       - repo
     vars:
       arches: x86_64
       fetch_artifacts: true
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-s390x
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: s390x
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-ppc64le
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: ppc64le
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: i686
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: armv7hl
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build-aarch64
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: aarch64
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: true
-      target: f35
+      target: f36
 
 - job:
     name: rpm-scratch-build
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     final: true
     provides:
       - repo
     vars:
       arches: x86_64
       fetch_artifacts: true
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-s390x
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: s390x
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-ppc64le
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: ppc64le
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: i686
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: armv7hl
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build-aarch64
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: aarch64
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: true
-      target: f34
+      target: f35
 
 - job:
     name: rpm-scratch-build
     parent: common-koji-rpm-build
     branches:
-      - f33
+      - f34
     final: true
     provides:
       - repo
     vars:
       arches: x86_64
       fetch_artifacts: true
-      release: f33
+      release: f34
       scratch_build: true
-      target: f33
+      target: f34
 
 - job:
     name: rpm-scratch-build-s390x
     parent: common-koji-rpm-build
     branches:
-      - f33
+      - f34
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: s390x
       fetch_artifacts: false
-      release: f33
+      release: f34
       scratch_build: true
-      target: f33
+      target: f34
 
 - job:
     name: rpm-scratch-build-ppc64le
     parent: common-koji-rpm-build
     branches:
-      - f33
+      - f34
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: ppc64le
       fetch_artifacts: false
-      release: f33
+      release: f34
       scratch_build: true
-      target: f33
+      target: f34
 
 - job:
     name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
-      - f33
+      - f34
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: i686
       fetch_artifacts: false
-      release: f33
+      release: f34
       scratch_build: true
-      target: f33
+      target: f34
 
 - job:
     name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
-      - f33
+      - f34
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: armv7hl
       fetch_artifacts: false
-      release: f33
+      release: f34
       scratch_build: true
-      target: f33
+      target: f34
 
 - job:
     name: rpm-scratch-build-aarch64
     parent: common-koji-rpm-build
     branches:
-      - f33
+      - f34
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: aarch64
       fetch_artifacts: false
-      release: f33
+      release: f34
       scratch_build: true
-      target: f33
+      target: f34
 
 - job:
     name: rpm-scratch-build
@@ -517,37 +517,37 @@
     name: rpm-build
     parent: common-koji-rpm-build
     branches:
-      - f35
+      - f36
     final: true
     vars:
       fetch_artifacts: false
-      release: f35
+      release: f36
       scratch_build: false
-      target: f35
+      target: f36
 
 - job:
     name: rpm-build
     parent: common-koji-rpm-build
     branches:
-      - f34
+      - f35
     final: true
     vars:
       fetch_artifacts: false
-      release: f34
+      release: f35
       scratch_build: false
-      target: f34
+      target: f35
 
 - job:
     name: rpm-build
     parent: common-koji-rpm-build
     branches:
-      - f33
+      - f34
     final: true
     vars:
       fetch_artifacts: false
-      release: f33
+      release: f34
       scratch_build: false
-      target: f33
+      target: f34
 
 - job:
     name: rpm-build
@@ -593,7 +593,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f35
+      - f36
     final: true
     nodeset: fedora-34-container
     requires:
@@ -606,8 +606,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-35
-      distro: fedora-35
+      compose: Fedora-36
+      distro: fedora-36
       test_type: fmf
 
 - job:
@@ -617,7 +617,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f34
+      - f35
     final: true
     nodeset: fedora-34-container
     requires:
@@ -630,8 +630,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-34
-      distro: fedora-34
+      compose: Fedora-35
+      distro: fedora-35
       test_type: fmf
 
 - job:
@@ -641,7 +641,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f33
+      - f34
     final: true
     nodeset: fedora-34-container
     requires:
@@ -654,8 +654,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-33
-      distro: fedora-33
+      compose: Fedora-34
+      distro: fedora-34
       test_type: fmf
 
 - job:
@@ -714,7 +714,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f35
+      - f36
     final: true
     nodeset: fedora-34-container
     requires:
@@ -727,8 +727,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-35
-      distro: fedora-35
+      compose: Fedora-36
+      distro: fedora-36
       test_type: sti
 
 - job:
@@ -738,7 +738,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f34
+      - f35
     final: true
     nodeset: fedora-34-container
     requires:
@@ -751,8 +751,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-34
-      distro: fedora-34
+      compose: Fedora-35
+      distro: fedora-35
       test_type: sti
 
 - job:
@@ -762,7 +762,7 @@
     post-run:
       - playbooks/testing-farm/fetch.yaml
     branches:
-      - f33
+      - f34
     final: true
     nodeset: fedora-34-container
     requires:
@@ -775,8 +775,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-33
-      distro: fedora-33
+      compose: Fedora-34
+      distro: fedora-34
       test_type: sti
 
 - job: