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/3] 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/3] 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

From 2646a23295fddd67c199bb15a238d238ede95142 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Oct 07 2019 07:58:21 +0000
Subject: [PATCH 3/3] Deactivate pipeline for fedora-zuul-jobs-config refact


---

diff --git a/playbooks/fakebuild.yaml b/playbooks/fakebuild.yaml
deleted file mode 100644
index b37e0bc..0000000
--- a/playbooks/fakebuild.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Run Koji build
-  command: "echo 'Fake koji run build'"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 59183fd..743c902 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,26 +1,8 @@
-- job:
-    name: rawhide-rpm-scratch-build
-    parent: base-rpm-scratch-build
-    description: RPM scratch build on for rawhide target
-    vars:
-      mock_config: fedora-rawhide-x86_64
-      target: rawhide
-
-# 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:
-      target: rawhide
-
 # 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
+#    parent: base-cloud-fedora-latest
     roles:
       - zuul: zuul-distro-jobs
     requires: repo
diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index 669b61e..017fec2 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -3,16 +3,17 @@
     name: basic-checks
     check:
       jobs:
-        - rawhide-rpm-scratch-build
-        - rawhide-rpm-test:
-            dependencies:
-              - rawhide-rpm-scratch-build
-        - artifact-rpm-lint:
-            dependencies:
-              - rawhide-rpm-scratch-build
-        - artifact-rpminspect:
-            dependencies:
-              - rawhide-rpm-scratch-build
+        - noop
+#        - rawhide-rpm-scratch-build
+#        - rawhide-rpm-test:
+#            dependencies:
+#              - rawhide-rpm-scratch-build
+#        - artifact-rpm-lint:
+#            dependencies:
+#              - rawhide-rpm-scratch-build
+#        - artifact-rpminspect:
+#            dependencies:
+#              - rawhide-rpm-scratch-build
     gate:
       jobs:
         - noop