From 636c5e64da0ba36ff229e91da8045d0ef2474c37 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Dec 21 2020 13:51:27 +0000
Subject: rpm-scratch-build and rpm-build migrate to container


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index a7d56e3..89e36f7 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -22,22 +22,6 @@
 
 - job:
     name: common-koji-rpm-build
-    parent: base-cloud-fedora-latest
-    abstract: true
-    protected: true
-    description: Base job for RPM build on Fedora Koji
-    # 6h timeout
-    timeout: 21600
-    roles:
-      - zuul: zuul-distro-jobs
-    secrets:
-      - krb_keytab
-    provides: repo
-    run: playbooks/koji/build.yaml
-    post-run: playbooks/koji/fetch.yaml
-
-- job:
-    name: common-koji-rpm-build-ng
     abstract: true
     protected: true
     description: Base job for RPM build on Fedora Koji
@@ -62,9 +46,10 @@
       release: master
       scratch_build: true
 
+# To be removed when rpms/Python-gear project pipelines is re-init
 - job:
     name: rpm-scratch-build-ng
-    parent: common-koji-rpm-build-ng
+    parent: common-koji-rpm-build
     final: true
     branches: master
     vars:
@@ -72,6 +57,7 @@
       target: rawhide
       release: master
       scratch_build: true
+      fetch_artifacts: false
 
 - job:
     name: rpm-scratch-build-aarch64
@@ -84,6 +70,7 @@
       release: master
       scratch_build: true
       arches: aarch64
+      fetch_artifacts: false
 
 - job:
     name: rpm-scratch-build
@@ -118,9 +105,6 @@
       release: epel8
       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: rpm-build
     parent: common-koji-rpm-build
@@ -130,6 +114,7 @@
       target: rawhide
       release: master
       scratch_build: false
+      fetch_artifacts: false
 
 - job:
     name: rpm-build
@@ -140,6 +125,7 @@
       target: f33
       release: f33
       scratch_build: false
+      fetch_artifacts: false
 
 - job:
     name: rpm-build
@@ -150,3 +136,4 @@
       target: f32
       release: f32
       scratch_build: false
+      fetch_artifacts: false