From 84d6b65ead17b04846a29d4c9f650899ca4bca43 Mon Sep 17 00:00:00 2001
From: ginger <ginger@redhat.com>
Date: Dec 01 2021 10:03:18 +0000
Subject: add distro var to Testing Farm jobs


Signed-off-by: ginger <ginger@redhat.com>

---

diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index 431cf92..9536d05 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -228,12 +228,23 @@ let getTestingFarmJobVars =
                 , F33 = "Fedora-33"
                 , F34 = "Fedora-34"
                 , F35 = "Fedora-35"
-                , Epel8 = "Fedora-epel8"
+                , Epel8 = "CentOS-Stream-8"
+                }
+                branch
+
+        let distro =
+              merge
+                { Rawhide = "fedora-rawhide"
+                , F33 = "fedora-33"
+                , F34 = "fedora-34"
+                , F35 = "fedora-35"
+                , Epel8 = "centos-stream-8"
                 }
                 branch
 
         in  Zuul.Vars.object
               [ { mapKey = "compose", mapValue = Zuul.Vars.string name }
+              , { mapKey = "distro", mapValue = Zuul.Vars.string distro }
               , { mapKey = "test_type", mapValue = Zuul.Vars.string ttype }
               ]
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 92b6941..86c220e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -569,6 +569,7 @@
     timeout: 21600
     vars:
       compose: Fedora-Rawhide
+      distro: fedora-rawhide
       test_type: fmf
 
 - job:
@@ -592,6 +593,7 @@
     timeout: 21600
     vars:
       compose: Fedora-35
+      distro: fedora-35
       test_type: fmf
 
 - job:
@@ -615,6 +617,7 @@
     timeout: 21600
     vars:
       compose: Fedora-34
+      distro: fedora-34
       test_type: fmf
 
 - job:
@@ -638,6 +641,7 @@
     timeout: 21600
     vars:
       compose: Fedora-33
+      distro: fedora-33
       test_type: fmf
 
 - job:
@@ -660,7 +664,8 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-epel8
+      compose: CentOS-Stream-8
+      distro: centos-stream-8
       test_type: fmf
 
 - job:
@@ -685,6 +690,7 @@
     timeout: 21600
     vars:
       compose: Fedora-Rawhide
+      distro: fedora-rawhide
       test_type: sti
 
 - job:
@@ -708,6 +714,7 @@
     timeout: 21600
     vars:
       compose: Fedora-35
+      distro: fedora-35
       test_type: sti
 
 - job:
@@ -731,6 +738,7 @@
     timeout: 21600
     vars:
       compose: Fedora-34
+      distro: fedora-34
       test_type: sti
 
 - job:
@@ -754,6 +762,7 @@
     timeout: 21600
     vars:
       compose: Fedora-33
+      distro: fedora-33
       test_type: sti
 
 - job:
@@ -776,5 +785,6 @@
         secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
-      compose: Fedora-epel8
+      compose: CentOS-Stream-8
+      distro: centos-stream-8
       test_type: sti