From 9f07f4505c7c6a1062222ea03849b5a1f85b7b88 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Feb 21 2022 12:32:56 +0000
Subject: Add f36 nodeset and improve Makefile


---

diff --git a/FZCI.dhall/Nodesets.dhall b/FZCI.dhall/Nodesets.dhall
index a8dda63..b241023 100644
--- a/FZCI.dhall/Nodesets.dhall
+++ b/FZCI.dhall/Nodesets.dhall
@@ -14,6 +14,7 @@ let Nodeset =
             | Centos-7-Container
             | Fedora-Rawhide-VM
             | Fedora-Latest-VM
+            | Fedora-36-VM
             | Fedora-35-VM
             | Fedora-34-VM
             | Fedora-33-VM
@@ -22,6 +23,7 @@ let Nodeset =
             | Fedora-30-VM
             | Fedora-Rawhide-VM-Medium
             | Fedora-Latest-VM-Medium
+            | Fedora-36-VM-Medium
             | Fedora-35-VM-Medium
             | Fedora-34-VM-Medium
             | Fedora-33-VM-Medium
@@ -42,6 +44,7 @@ let Nodeset =
             , Union.Centos-7-Container
             , Union.Fedora-Rawhide-VM
             , Union.Fedora-Latest-VM
+            , Union.Fedora-36-VM
             , Union.Fedora-35-VM
             , Union.Fedora-34-VM
             , Union.Fedora-33-VM
@@ -50,6 +53,7 @@ let Nodeset =
             , Union.Fedora-30-VM
             , Union.Fedora-Rawhide-VM-Medium
             , Union.Fedora-Latest-VM-Medium
+            , Union.Fedora-36-VM-Medium
             , Union.Fedora-35-VM-Medium
             , Union.Fedora-34-VM-Medium
             , Union.Fedora-33-VM-Medium
@@ -102,6 +106,8 @@ let Nodeset =
                       "fedora-latest-vm"
                       "cloud-fedora-${latest-version}-small"
                       "cloud-host"
+                , Fedora-36-VM =
+                    create "fedora-36-vm" "cloud-fedora-36-small" "cloud-host"
                 , Fedora-35-VM =
                     create "fedora-35-vm" "cloud-fedora-35-small" "cloud-host"
                 , Fedora-34-VM =
@@ -124,6 +130,11 @@ let Nodeset =
                       "fedora-latest-vm-medium"
                       "cloud-fedora-${latest-version}-medium"
                       "cloud-host"
+                , Fedora-36-VM-Medium =
+                    create
+                      "fedora-36-vm-medium"
+                      "cloud-fedora-36-medium"
+                      "cloud-host"
                 , Fedora-35-VM-Medium =
                     create
                       "fedora-35-vm-medium"
diff --git a/Makefile b/Makefile
index 7bbb4b5..8b2c1c7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ render:
 	@dhall hash --file $$FZCI > /dev/null
 	$(call generate_file,../fedora-zuul-jobs-config/zuul.d/jobs)
 	$(call generate_file,../fedora-zuul-jobs/zuul.d/jobs)
+	$(call generate_file,../fedora-zuul-jobs/zuul.d/nodesets)
+	$(call generate_file,../fedora-zuul-jobs/zuul.d/templates)
 
 define clone
 	@test -d ../$(1)/.git || git clone https://pagure.io/$(1).git ../$(1)/