From 93e4332d50114f56b62dd64dda2ad7c0b4b810b6 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Aug 14 2019 10:41:40 +0000
Subject: Enable the fedpkg build in the post pipeline


Also rename jobs to simplify the naming.

---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4abafe0..cf19cff 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: rawhide-rpm-koji-scratch-build
+    name: rawhide-rpm-scratch-build
     parent: base-rpm-scratch-build
     description: RPM scratch build on for rawhide target
     vars:
@@ -11,13 +11,21 @@
           label: cloud-fedora
 
 - job:
-    name: rawhide-rpm-koji-build
+    name: rawhide-rpm-build
+    parent: base-rpm-build
     description: RPM build on for rawhide target
-    run: playbooks/fakebuild.yaml
+    vars:
+      mock_config: fedora-rawhide-x86_64
+      target: rawhide
     nodeset:
       nodes:
-        - name: container
-          label: runc-fedora-30
+         # Could run on a container. Remove the createrepo stuff from
+         # fedpkg-build in case of non scratch build. Install fedpkg
+         # on the fedora-30 container
+#        - name: container
+#          label: runc-fedora-30
+        - name: mock-host
+          label: cloud-fedora
 
 - job:
     name: rawhide-rpm-test
diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index ef6cd60..93b9084 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -3,16 +3,16 @@
     name: basic-checks
     check:
       jobs:
-        - rawhide-rpm-koji-scratch-build
+        - rawhide-rpm-scratch-build
         - rawhide-rpm-test:
             dependencies:
-              - rawhide-rpm-koji-scratch-build
+              - rawhide-rpm-scratch-build
         - artifact-rpm-lint:
             dependencies:
-              - rawhide-rpm-koji-scratch-build
+              - rawhide-rpm-scratch-build
     gate:
       jobs:
         - noop
     post:
       jobs:
-        - rawhide-rpm-koji-build
+        - rawhide-rpm-build