From 4af7cfb602bde3d88eac4fe5cc3dd54929f962fa Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Sep 09 2020 15:32:11 +0000
Subject: [PATCH 1/2] Add fedora 33 nodesets


---

diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 9b2cfe1..4a200b4 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -7,6 +7,12 @@
 
 # Container nodesets
 - nodeset:
+    name: fedora-33-container
+    nodes:
+      - name: container
+        label: pod-fedora-33
+
+- nodeset:
     name: fedora-32-container
     nodes:
       - name: container
@@ -46,16 +52,22 @@
         label: cloud-fedora-rawhide-small
 
 - nodeset:
-    name: fedora-32-vm
+    name: fedora-latest-vm
     nodes:
       - name: cloud-host
-        label: cloud-fedora-32-small
+        label: cloud-fedora-31-small
 
 - nodeset:
-    name: fedora-latest-vm
+    name: fedora-33-vm
     nodes:
       - name: cloud-host
-        label: cloud-fedora-31-small
+        label: cloud-fedora-33-small
+
+- nodeset:
+    name: fedora-32-vm
+    nodes:
+      - name: cloud-host
+        label: cloud-fedora-32-small
 
 - nodeset:
     name: fedora-31-vm
@@ -83,16 +95,22 @@
         label: cloud-fedora-rawhide-medium
 
 - nodeset:
-    name: fedora-32-vm-medium
+    name: fedora-latest-vm-medium
     nodes:
       - name: cloud-host
-        label: cloud-fedora-32-medium
+        label: cloud-fedora-31-medium
 
 - nodeset:
-    name: fedora-latest-vm-medium
+    name: fedora-33-vm-medium
     nodes:
       - name: cloud-host
-        label: cloud-fedora-31-medium
+        label: cloud-fedora-33-medium
+
+- nodeset:
+    name: fedora-32-vm-medium
+    nodes:
+      - name: cloud-host
+        label: cloud-fedora-32-medium
 
 - nodeset:
     name: fedora-31-vm-medium

From 48d0a046da481a063dd00a691972ccca2844039a Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Sep 09 2020 15:32:20 +0000
Subject: [PATCH 2/2] Make use of f33 nodesets rpm tests jobs


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 5336b5e..ddb4314 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -25,7 +25,7 @@
     name: rpm-install-test
     parent: base-rpm-install-test
     branches: f33
-    nodeset: fedora-rawhide-vm
+    nodeset: fedora-33-container
     vars:
       repos:
         - name: f33-build
@@ -81,7 +81,7 @@
     name: rpm-test
     parent: base-rpm-test
     branches: f33
-    nodeset: fedora-rawhide-vm-medium
+    nodeset: fedora-33-vm-medium
     vars:
       repos:
         - name: f33-build