From fcfe6ab6f61bf35cf6441b0cedcf8892bacd2a60 Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Aug 30 2021 12:09:39 +0000
Subject: [PATCH 1/6] Add zuul config for testing RPMs


Signed-off-by: Adam Saleh <asaleh@redhat.com>

---

diff --git a/.zuul.yaml b/.zuul.yaml
index f86577b..3158358 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,21 @@
 ---
+- project-template:
+    name: rpm-build
+    check:
+      jobs:
+        - rpm-scratch-build
+- project-template:
+    name: rpm-lint
+    check:
+      jobs:
+        - rpm-linter:
+          dependencies:
+            - rpm-scratch-build
+        - rpm-rpminspect:
+          voting: False
+          dependencies:
+            - rpm-scratch-build
+          
 - job:
     name: tox-f33
     run: ci/tox.yaml
@@ -7,6 +24,9 @@
         name: test-node
         label: pod-python-f33
 - project:
+    templates:
+      - rpm-build
+      - rpm-lint
     check:
       jobs:
         - tox-f33

From ae8a8bc3db16f4f21d74f9a7ef338fef46148030 Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Aug 30 2021 12:09:39 +0000
Subject: [PATCH 2/6] Change zuul configuration to mockbuild


Signed-off-by: Adam Saleh <asaleh@redhat.com>

---

diff --git a/.zuul.yaml b/.zuul.yaml
index 3158358..d09bd40 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,21 +1,4 @@
 ---
-- project-template:
-    name: rpm-build
-    check:
-      jobs:
-        - rpm-scratch-build
-- project-template:
-    name: rpm-lint
-    check:
-      jobs:
-        - rpm-linter:
-          dependencies:
-            - rpm-scratch-build
-        - rpm-rpminspect:
-          voting: False
-          dependencies:
-            - rpm-scratch-build
-          
 - job:
     name: tox-f33
     run: ci/tox.yaml
@@ -24,9 +7,14 @@
         name: test-node
         label: pod-python-f33
 - project:
-    templates:
-      - rpm-build
-      - rpm-lint
     check:
       jobs:
         - tox-f33
+        - rpm-mock-build:
+            vars:
+              mock_config: fedora-33-x86_64
+              build_from_source: true
+              version_from_specfile: true
+              src_name: rpmautospec
+            nodeset: fedora-33-vm
+          

From d327df893e5a0ac14dff648e8825f2b9988c8cfb Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Aug 30 2021 12:12:45 +0000
Subject: [PATCH 3/6] Attemt to fix the zuul-config for rpm mock build


---

diff --git a/.zuul.yaml b/.zuul.yaml
index d09bd40..6c57dda 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,6 +15,6 @@
               mock_config: fedora-33-x86_64
               build_from_source: true
               version_from_specfile: true
-              src_name: rpmautospec
+              src_name: mirrors-countme
             nodeset: fedora-33-vm
           

From 0f499fef019b9340ddcd57561b096e82ce397529 Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Aug 30 2021 12:12:52 +0000
Subject: [PATCH 4/6] Adding a zuul koji build


---

diff --git a/.zuul.yaml b/.zuul.yaml
index 6c57dda..c2eda8c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,4 +17,10 @@
               version_from_specfile: true
               src_name: mirrors-countme
             nodeset: fedora-33-vm
+         - rpm-build:
+            vars:
+              build_from_source: true
+              version_from_specfile: true
+              src_name: mirrors-countme
+            nodeset: fedora-33-vm
           

From 2d355034d8957279209b3a8a8faaeefad6f2da72 Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Aug 30 2021 12:12:52 +0000
Subject: [PATCH 5/6] Change to a minimal rpmbuild config


---

diff --git a/.zuul.yaml b/.zuul.yaml
index c2eda8c..bfdf668 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,10 +17,4 @@
               version_from_specfile: true
               src_name: mirrors-countme
             nodeset: fedora-33-vm
-         - rpm-build:
-            vars:
-              build_from_source: true
-              version_from_specfile: true
-              src_name: mirrors-countme
-            nodeset: fedora-33-vm
-          
+        - rpm-build

From 2d4ea09b64f4d0e4f4b2ddf3ee6ab682f7419359 Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Aug 30 2021 12:12:52 +0000
Subject: [PATCH 6/6] Change rpm-build to epel8


---

diff --git a/.zuul.yaml b/.zuul.yaml
index bfdf668..668bf81 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,4 +17,7 @@
               version_from_specfile: true
               src_name: mirrors-countme
             nodeset: fedora-33-vm
-        - rpm-build
+        - rpm-build:
+            vars:
+              target: epel8
+              release: epel8

