From 28f1d434e0528b93d4a2c98e063f9fba670466a5 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Oct 04 2019 15:35:43 +0000
Subject: [PATCH 1/2] Cleaning


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 912b3d3..ba1d4fe 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -5,59 +5,38 @@
     vars:
       mock_config: fedora-rawhide-x86_64
       target: rawhide
-    nodeset:
-      nodes:
-        - name: mock-host
-          label: cloud-fedora
-    host-vars:
-      mock-host:
-        ansible_python_interpreter: /usr/bin/python3
 
+# 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: rawhide-rpm-build
     parent: base-rpm-build
     description: RPM build on for rawhide target
     vars:
-      mock_config: fedora-rawhide-x86_64
       target: rawhide
-    nodeset:
-      nodes:
-         # 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
-    host-vars:
-      mock-host:
-        ansible_python_interpreter: /usr/bin/python3
 
+# TODO(fbo): Should run on Fedora Rawhide virtual machine
 - job:
     name: rawhide-rpm-test
     description: Run the test.yml test
+    parent: base-cloud-fedora-30
     roles:
       - zuul: zuul-distro-jobs
     requires: repo
     run: playbooks/rpm/rpmtest.yaml
-    nodeset:
-      nodes:
-        - name: node
-          label: cloud-fedora
-    host-vars:
-      node:
-        ansible_python_interpreter: /usr/bin/python3
 
+# TODO(fbo): Try variant to inherit from base-cloud-fedora-30 job
 - job:
     name: artifact-rpm-lint
     parent: base-artifact-rpm-lint
     requires: repo
     nodeset:
       nodes:
-        - name: node
-          label: cloud-fedora
+        - name: cloud-host
+          label: cloud-fedora-30
     host-vars:
-      node:
+      cloud-host:
         ansible_python_interpreter: /usr/bin/python3
 
 - job:

From 46ad13c44a34a448a67fc1bf72d89367a989ac07 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Oct 04 2019 15:36:48 +0000
Subject: [PATCH 2/2] Fix rpminspect nodeset


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ba1d4fe..59183fd 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -39,6 +39,7 @@
       cloud-host:
         ansible_python_interpreter: /usr/bin/python3
 
+# TODO(fbo): Try variant to inherit from base-cloud-fedora-30 job
 - job:
     name: artifact-rpminspect
     parent: rpminspect
@@ -47,8 +48,8 @@
       check_previous_build_enabled: true
     nodeset:
       nodes:
-        - name: node
-          label: cloud-fedora
+        - name: cloud-host
+          label: cloud-fedora-30
     host-vars:
       node:
         ansible_python_interpreter: /usr/bin/python3