From 4b1ef9b8d4b91387b1112943634decd384999c38 Mon Sep 17 00:00:00 2001
From: ginger <ginger@redhat.com>
Date: Nov 03 2021 19:39:40 +0000
Subject: add sti test-type jobs


---

diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index 4ede0f3..e5e1adf 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -219,8 +219,9 @@ let generateRpmBuildJobs
               forBranch
               Branches.all
 
-let getTMTJobVars =
+let getTestingFarmJobVars =
       λ(branch : Branches.Type) →
+      λ(ttype : Text) →
         let name =
               merge
                 { Rawhide = "Fedora-Rawhide"
@@ -232,10 +233,40 @@ let getTMTJobVars =
                 branch
 
         in  Zuul.Vars.object
-              [ { mapKey = "compose", mapValue = Zuul.Vars.string name }  
-              , { mapKey = "test_type", mapValue = Zuul.Vars.string "fmf" }
+              [ { mapKey = "compose", mapValue = Zuul.Vars.string name }
+              , { mapKey = "test_type", mapValue = Zuul.Vars.string ttype }
               ]
 
+let generateSTITestsJob =
+      λ(branch : Branches.Type) →
+        Zuul.Job::{
+        , name = "rpm-sti-test"
+        , description = Some "Running sti test on Testing Farm"
+        , final = Some True
+        , branches = Branches.zuulBranch branch
+        , roles = Some
+          [ { zuul = "zuul-distro-jobs" }, { zuul = "fedora-zuul-jobs" } ]
+        , timeout = Some 21600
+        , nodeset = Some default_nodeset
+        , requires = Some [ "repo" ]
+        , secrets = Some
+          [ Zuul.Job.Secret::{
+            , name = "testing_farm_zuul_fedora_ci_key"
+            , secret = "testing_farm_zuul_fedora_ci_key"
+            }
+          ]
+        , run = Some "playbooks/testing-farm/run.yaml"
+        , post-run = Some [ "playbooks/testing-farm/fetch.yaml" ]
+        , vars = Some (getTestingFarmJobVars branch "sti")
+        }
+
+let generateSTITestsJobs =
+      Prelude.List.map
+        Branches.Type
+        Zuul.Job.Type
+        generateSTITestsJob
+        Branches.all
+
 let generateTMTTestsJob =
       λ(branch : Branches.Type) →
         Zuul.Job::{
@@ -256,7 +287,7 @@ let generateTMTTestsJob =
           ]
         , run = Some "playbooks/testing-farm/run.yaml"
         , post-run = Some [ "playbooks/testing-farm/fetch.yaml" ]
-        , vars = Some (getTMTJobVars branch)
+        , vars = Some (getTestingFarmJobVars branch "fmf")
         }
 
 let generateTMTTestsJobs =
@@ -276,5 +307,6 @@ let Jobs =
       # generateRpmBuildJobs KojiBuild.Type.Scratch
       # generateRpmBuildJobs KojiBuild.Type.Final
       # generateTMTTestsJobs
+      # generateSTITestsJobs
 
 in  Zuul.Job.wrap Jobs
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6e4bc5a..61c9c12 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -662,3 +662,119 @@
     vars:
       compose: Fedora-epel8
       test_type: fmf
+
+- job:
+    name: rpm-sti-test
+    description: Running sti test on Testing Farm
+    run: playbooks/testing-farm/run.yaml
+    post-run:
+      - playbooks/testing-farm/fetch.yaml
+    branches:
+      - rawhide
+      - main
+    final: true
+    nodeset: fedora-33-container
+    requires:
+      - repo
+    roles:
+      - zuul: zuul-distro-jobs
+      - zuul: fedora-zuul-jobs
+    secrets:
+      - name: testing_farm_zuul_fedora_ci_key
+        secret: testing_farm_zuul_fedora_ci_key
+    timeout: 21600
+    vars:
+      compose: Fedora-Rawhide
+      test_type: sti
+
+- job:
+    name: rpm-sti-test
+    description: Running sti test on Testing Farm
+    run: playbooks/testing-farm/run.yaml
+    post-run:
+      - playbooks/testing-farm/fetch.yaml
+    branches:
+      - f35
+    final: true
+    nodeset: fedora-33-container
+    requires:
+      - repo
+    roles:
+      - zuul: zuul-distro-jobs
+      - zuul: fedora-zuul-jobs
+    secrets:
+      - name: testing_farm_zuul_fedora_ci_key
+        secret: testing_farm_zuul_fedora_ci_key
+    timeout: 21600
+    vars:
+      compose: Fedora-35
+      test_type: sti
+
+- job:
+    name: rpm-sti-test
+    description: Running sti test on Testing Farm
+    run: playbooks/testing-farm/run.yaml
+    post-run:
+      - playbooks/testing-farm/fetch.yaml
+    branches:
+      - f34
+    final: true
+    nodeset: fedora-33-container
+    requires:
+      - repo
+    roles:
+      - zuul: zuul-distro-jobs
+      - zuul: fedora-zuul-jobs
+    secrets:
+      - name: testing_farm_zuul_fedora_ci_key
+        secret: testing_farm_zuul_fedora_ci_key
+    timeout: 21600
+    vars:
+      compose: Fedora-34
+      test_type: sti
+
+- job:
+    name: rpm-sti-test
+    description: Running sti test on Testing Farm
+    run: playbooks/testing-farm/run.yaml
+    post-run:
+      - playbooks/testing-farm/fetch.yaml
+    branches:
+      - f33
+    final: true
+    nodeset: fedora-33-container
+    requires:
+      - repo
+    roles:
+      - zuul: zuul-distro-jobs
+      - zuul: fedora-zuul-jobs
+    secrets:
+      - name: testing_farm_zuul_fedora_ci_key
+        secret: testing_farm_zuul_fedora_ci_key
+    timeout: 21600
+    vars:
+      compose: Fedora-33
+      test_type: sti
+
+- job:
+    name: rpm-sti-test
+    description: Running sti test on Testing Farm
+    run: playbooks/testing-farm/run.yaml
+    post-run:
+      - playbooks/testing-farm/fetch.yaml
+    branches:
+      - epel8
+    final: true
+    nodeset: fedora-33-container
+    requires:
+      - repo
+    roles:
+      - zuul: zuul-distro-jobs
+      - zuul: fedora-zuul-jobs
+    secrets:
+      - name: testing_farm_zuul_fedora_ci_key
+        secret: testing_farm_zuul_fedora_ci_key
+    timeout: 21600
+    vars:
+      compose: Fedora-epel8
+      test_type: sti