From ae22d5d70d4ca1fb1a5824062b209424c61b30d3 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Oct 04 2019 15:15:31 +0000
Subject: Split base jobs


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 50d277f..b02d04f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,36 +1,49 @@
 - job:
-    name: base-rpm-scratch-build
+    name: base-cloud-fedora-30
     abstract: true
-    description: base job for RPM scratch build on Fedora Koji
+    description: base job to run on a Fedora 30 virtual machine
+    nodeset:
+      nodes:
+        - name: cloud-host
+          label: cloud-fedora-30
+    host-vars:
+      cloud-host:
+        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
+    abstract: true
+    description: commun base job for RPM build on Fedora Koji
     roles:
       - zuul: zuul-distro-jobs
     provides: repo
     requires: repo
     run: playbooks/koji/build.yaml
     post-run: playbooks/koji/fetch.yaml
-    secrets:
-      - krb_keytab
-    nodeset:
-      nodes:
-        - name: mock-host
-          label: cloud-fedora
+
+# TODO(fbo): move below jobs in fedora-zuul-jobs
+
+- job:
+    name: base-rpm-scratch-build
+    parent: commun-koji-rpm-build
+    abstract: true
+    description: base job for RPM scratch build on Fedora Koji
     vars:
       scratch_build: true
 
 - job:
     name: base-rpm-build
+    parent: commun-koji-rpm-build
     abstract: true
     description: base job for RPM build on Fedora Koji
-    roles:
-      - zuul: zuul-distro-jobs
-    provides: repo
-    run: playbooks/koji/publish.yaml
-    post-run: playbooks/koji/fetch.yaml
-    secrets:
-      - krb_keytab
-    nodeset:
-      nodes:
-        - name: mock-host
-          label: cloud-fedora
     vars:
       scratch_build: false