From 3a0a96b62313bb87436a4eb48476aedde4e860cb Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Jan 06 2021 16:48:00 +0000
Subject: [PATCH 1/2] Add missing job-prefix for dependency name and provides


This change adds a missing job prefix for the preview of
test-arches job.

---

diff --git a/zuul.d/jobs-preview.yaml b/zuul.d/jobs-preview.yaml
index 464220f..aaf55c1 100644
--- a/zuul.d/jobs-preview.yaml
+++ b/zuul.d/jobs-preview.yaml
@@ -38,7 +38,7 @@
     nodeset: fedora-33-container
     protected: true
     provides:
-      - repo
+      - preview-repo
     roles:
       - zuul: zuul-distro-jobs
     secrets:
@@ -65,7 +65,7 @@
     branches:
       - master
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: s390x
@@ -80,7 +80,7 @@
     branches:
       - master
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: ppc64le
@@ -95,7 +95,7 @@
     branches:
       - master
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: i686
@@ -110,7 +110,7 @@
     branches:
       - master
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: armv7hl
@@ -125,7 +125,7 @@
     branches:
       - master
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: aarch64
@@ -153,7 +153,7 @@
     branches:
       - f33
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: s390x
@@ -168,7 +168,7 @@
     branches:
       - f33
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: ppc64le
@@ -183,7 +183,7 @@
     branches:
       - f33
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: i686
@@ -198,7 +198,7 @@
     branches:
       - f33
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: armv7hl
@@ -213,7 +213,7 @@
     branches:
       - f33
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: aarch64
@@ -241,7 +241,7 @@
     branches:
       - f32
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: s390x
@@ -256,7 +256,7 @@
     branches:
       - f32
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: ppc64le
@@ -271,7 +271,7 @@
     branches:
       - f32
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: i686
@@ -286,7 +286,7 @@
     branches:
       - f32
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: armv7hl
@@ -301,7 +301,7 @@
     branches:
       - f32
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: aarch64
@@ -329,7 +329,7 @@
     branches:
       - epel8
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: ppc64le
@@ -344,7 +344,7 @@
     branches:
       - epel8
     dependencies:
-      - check-for-arches
+      - preview-check-for-arches
     final: true
     vars:
       arches: aarch64
diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index 51eb339..61d739d 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -22,7 +22,7 @@ let Prelude =
 
 let --| When setting a custom prefix, redirect the output to a new file to preserve the existing job definition
     job-prefix =
-      ""
+      env:JOB_PREFIX as Text ? ""
 
 let Arch =
       let Union = < X86_64 | S390X | PPC64LE | I686 | ARMV7HL | AARCH64 >
@@ -190,7 +190,7 @@ let common_koji_rpm_build =
       , nodeset = Some (Zuul.Nodeset.Name "fedora-33-container")
       , roles = Some [ { zuul = "zuul-distro-jobs" } ]
       , run = Some "playbooks/koji/build-ng.yaml"
-      , provides = Some [ "repo" ]
+      , provides = Some [ "${job-prefix}repo" ]
       , secrets = Some
         [ Zuul.Job.Secret::{ name = "krb_keytab", secret = "krb_keytab" } ]
       }
@@ -238,7 +238,8 @@ let generateRpmBuildJob =
         , dependencies =
             if    Arch.isX86_64 arch
             then  None (List Zuul.Job.Dependency.union)
-            else  Some [ Zuul.Job.Dependency.Name "check-for-arches" ]
+            else  Some
+                    [ Zuul.Job.Dependency.Name "${job-prefix}check-for-arches" ]
         , branches = Some [ Branch.show branch ]
         , vars = Some
             ( setVars

From f50f5029c3affa42729c9b45a9710c1905dc60f5 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Jan 06 2021 16:52:39 +0000
Subject: [PATCH 2/2] Enable preview build for python-gear


---

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 0475be9..70c9208 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -18,6 +18,19 @@
     name: rpms/python-gear
     templates:
       - publish
+    check:
+      jobs:
+       - preview-check-for-arches
+       - preview-rpm-scratch-build-aarch64:
+           voting: false
+       - preview-rpm-scratch-build-ppc64le:
+           voting: false
+       - preview-rpm-scratch-build-armv7hl:
+           voting: false
+       - preview-rpm-scratch-build-i686:
+           voting: false
+       - preview-rpm-scratch-build-s390x:
+           voting: false
 
 - project:
     name: rpms/python-ws4py