From e4efd1648f70d5d3e8f968fa59d4b2d44f16d2e0 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Oct 07 2019 07:42:20 +0000
Subject: More base jobs refactor


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index b02d04f..57f5aac 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,7 +1,7 @@
 - job:
-    name: base-cloud-fedora-30
+    name: base-cloud-fedora-latest
     abstract: true
-    description: base job to run on a Fedora 30 virtual machine
+    description: base job to run on a Fedora virtual machine
     nodeset:
       nodes:
         - name: cloud-host
@@ -11,39 +11,38 @@
         ansible_python_interpreter: /usr/bin/python3
 
 - job:
-    name: base-koji-rpm-build
-    parent: base-cloud-fedora-30
-    abstract: true
-    description: base job to build on Fedora Koji
-    secrets:
-      - krb_keytab
-
-- job:
     name: commun-koji-rpm-build
-    parent: base-koji-rpm-build
+    parent: base-cloud-fedora-latest
     abstract: true
+    protected: true
     description: commun base job for RPM build on Fedora Koji
     roles:
       - zuul: zuul-distro-jobs
+    secrets:
+      - krb_keytab
     provides: repo
     requires: repo
     run: playbooks/koji/build.yaml
     post-run: playbooks/koji/fetch.yaml
 
-# TODO(fbo): move below jobs in fedora-zuul-jobs
-
 - job:
-    name: base-rpm-scratch-build
+    name: rawhide-rpm-scratch-build
     parent: commun-koji-rpm-build
-    abstract: true
-    description: base job for RPM scratch build on Fedora Koji
+    final: true
+    description: RPM scratch build on for rawhide target
     vars:
+      mock_config: fedora-rawhide-x86_64
+      target: rawhide
       scratch_build: true
 
+# TODO(fbo): In order to have this job run on a container then
+# fix fedpkg-role to not build the local repo + install deps at
+# container build time.
 - job:
-    name: base-rpm-build
+    name: rawhide-rpm-build
     parent: commun-koji-rpm-build
-    abstract: true
-    description: base job for RPM build on Fedora Koji
+    final: true
+    description: RPM build on for rawhide target
     vars:
+      target: rawhide
       scratch_build: false