From 88ac0462a798ee709d9a90aa7e6f7a2f3b99fec0 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Feb 21 2022 12:36:29 +0000
Subject: Enable f36 nodeset for rpm-test and rpm-install-test


---

diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index 2a114a1..9d720c9 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -48,7 +48,7 @@ let createRpmInstallTestJob
                   { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM
                   , F34 = Nodesets.getName Nodesets.Type.Fedora-34-Container
                   , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium
-                  , F36 = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM
+                  , F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM
                   , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
                   }
                   branch
@@ -83,8 +83,7 @@ let createRpmTestJob
                       Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium
                   , F34 = Nodesets.getName Nodesets.Type.Fedora-34-VM-Medium
                   , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium
-                  , F36 =
-                      Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium
+                  , F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM-Medium
                   , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
                   }
                   branch
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ab48e2f..b80c320 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -23,7 +23,7 @@
     run: playbooks/rpm/rpm-install-test.yaml
     branches:
       - f36
-    nodeset: fedora-rawhide-vm
+    nodeset: fedora-36-vm
     requires:
       - repo
     roles:
@@ -111,7 +111,7 @@
       - playbooks/rpm/rpmtest-fetch-artifacts.yaml
     branches:
       - f36
-    nodeset: fedora-rawhide-vm-medium
+    nodeset: fedora-36-vm-medium
     requires:
       - repo
     roles:
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 5a7112b..6033ba5 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -61,6 +61,12 @@
         name: cloud-host
 
 - nodeset:
+    name: fedora-36-vm
+    nodes:
+      - label: cloud-fedora-36-small
+        name: cloud-host
+
+- nodeset:
     name: fedora-35-vm
     nodes:
       - label: cloud-fedora-35-small
@@ -109,6 +115,12 @@
         name: cloud-host
 
 - nodeset:
+    name: fedora-36-vm-medium
+    nodes:
+      - label: cloud-fedora-36-medium
+        name: cloud-host
+
+- nodeset:
     name: fedora-35-vm-medium
     nodes:
       - label: cloud-fedora-35-medium