From 3454f0d7b2551cffaa1b4d4dee8b34ddea291ef1 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Jan 08 2021 09:34:50 +0000
Subject: Activate check-for-arches for koji scratch-build


This change enables the check-for-arches parent job as demonstrated
in https://src.fedoraproject.org/rpms/python-gear/pull-request/38
and https://src.fedoraproject.org/rpms/python-gear/pull-request/32

---

diff --git a/zuul.d/jobs-preview.yaml b/zuul.d/jobs-preview.yaml
deleted file mode 100644
index aaf55c1..0000000
--- a/zuul.d/jobs-preview.yaml
+++ /dev/null
@@ -1,402 +0,0 @@
-
-- job:
-    name: preview-check-for-tests
-    description: Check the project has a tests/tests.yml
-    run: playbooks/rpm/check-for-tests.yaml
-    branches:
-      - master
-      - f33
-      - f32
-      - epel8
-    nodeset:
-      nodes: []
-
-- job:
-    name: preview-check-for-arches
-    description: Check the packages needs arches builds
-    run: playbooks/rpm/check-for-arches.yaml
-    branches:
-      - master
-      - f33
-      - f32
-      - epel8
-    nodeset:
-      nodes: []
-    vars:
-      arch_jobs:
-        - preview-rpm-scratch-build-s390x
-        - preview-rpm-scratch-build-ppc64le
-        - preview-rpm-scratch-build-i686
-        - preview-rpm-scratch-build-armv7hl
-        - preview-rpm-scratch-build-aarch64
-
-- job:
-    name: preview-common-koji-rpm-build
-    description: Base job for RPM build on Fedora Koji
-    run: playbooks/koji/build-ng.yaml
-    abstract: true
-    nodeset: fedora-33-container
-    protected: true
-    provides:
-      - preview-repo
-    roles:
-      - zuul: zuul-distro-jobs
-    secrets:
-      - name: krb_keytab
-        secret: krb_keytab
-    timeout: 21600
-
-- job:
-    name: preview-rpm-scratch-build
-    parent: preview-common-koji-rpm-build
-    branches:
-      - master
-    final: true
-    vars:
-      arches: x86_64
-      fetch_artifacts: true
-      release: master
-      scratch_build: true
-      target: rawhide
-
-- job:
-    name: preview-rpm-scratch-build-s390x
-    parent: preview-common-koji-rpm-build
-    branches:
-      - master
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: s390x
-      fetch_artifacts: false
-      release: master
-      scratch_build: true
-      target: rawhide
-
-- job:
-    name: preview-rpm-scratch-build-ppc64le
-    parent: preview-common-koji-rpm-build
-    branches:
-      - master
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: ppc64le
-      fetch_artifacts: false
-      release: master
-      scratch_build: true
-      target: rawhide
-
-- job:
-    name: preview-rpm-scratch-build-i686
-    parent: preview-common-koji-rpm-build
-    branches:
-      - master
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: i686
-      fetch_artifacts: false
-      release: master
-      scratch_build: true
-      target: rawhide
-
-- job:
-    name: preview-rpm-scratch-build-armv7hl
-    parent: preview-common-koji-rpm-build
-    branches:
-      - master
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: armv7hl
-      fetch_artifacts: false
-      release: master
-      scratch_build: true
-      target: rawhide
-
-- job:
-    name: preview-rpm-scratch-build-aarch64
-    parent: preview-common-koji-rpm-build
-    branches:
-      - master
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: aarch64
-      fetch_artifacts: false
-      release: master
-      scratch_build: true
-      target: rawhide
-
-- job:
-    name: preview-rpm-scratch-build
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f33
-    final: true
-    vars:
-      arches: x86_64
-      fetch_artifacts: true
-      release: f33
-      scratch_build: true
-      target: f33
-
-- job:
-    name: preview-rpm-scratch-build-s390x
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f33
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: s390x
-      fetch_artifacts: false
-      release: f33
-      scratch_build: true
-      target: f33
-
-- job:
-    name: preview-rpm-scratch-build-ppc64le
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f33
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: ppc64le
-      fetch_artifacts: false
-      release: f33
-      scratch_build: true
-      target: f33
-
-- job:
-    name: preview-rpm-scratch-build-i686
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f33
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: i686
-      fetch_artifacts: false
-      release: f33
-      scratch_build: true
-      target: f33
-
-- job:
-    name: preview-rpm-scratch-build-armv7hl
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f33
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: armv7hl
-      fetch_artifacts: false
-      release: f33
-      scratch_build: true
-      target: f33
-
-- job:
-    name: preview-rpm-scratch-build-aarch64
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f33
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: aarch64
-      fetch_artifacts: false
-      release: f33
-      scratch_build: true
-      target: f33
-
-- job:
-    name: preview-rpm-scratch-build
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f32
-    final: true
-    vars:
-      arches: x86_64
-      fetch_artifacts: true
-      release: f32
-      scratch_build: true
-      target: f32
-
-- job:
-    name: preview-rpm-scratch-build-s390x
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f32
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: s390x
-      fetch_artifacts: false
-      release: f32
-      scratch_build: true
-      target: f32
-
-- job:
-    name: preview-rpm-scratch-build-ppc64le
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f32
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: ppc64le
-      fetch_artifacts: false
-      release: f32
-      scratch_build: true
-      target: f32
-
-- job:
-    name: preview-rpm-scratch-build-i686
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f32
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: i686
-      fetch_artifacts: false
-      release: f32
-      scratch_build: true
-      target: f32
-
-- job:
-    name: preview-rpm-scratch-build-armv7hl
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f32
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: armv7hl
-      fetch_artifacts: false
-      release: f32
-      scratch_build: true
-      target: f32
-
-- job:
-    name: preview-rpm-scratch-build-aarch64
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f32
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: aarch64
-      fetch_artifacts: false
-      release: f32
-      scratch_build: true
-      target: f32
-
-- job:
-    name: preview-rpm-scratch-build
-    parent: preview-common-koji-rpm-build
-    branches:
-      - epel8
-    final: true
-    vars:
-      arches: x86_64
-      fetch_artifacts: true
-      release: epel8
-      scratch_build: true
-      target: epel8
-
-- job:
-    name: preview-rpm-scratch-build-ppc64le
-    parent: preview-common-koji-rpm-build
-    branches:
-      - epel8
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: ppc64le
-      fetch_artifacts: false
-      release: epel8
-      scratch_build: true
-      target: epel8
-
-- job:
-    name: preview-rpm-scratch-build-aarch64
-    parent: preview-common-koji-rpm-build
-    branches:
-      - epel8
-    dependencies:
-      - preview-check-for-arches
-    final: true
-    vars:
-      arches: aarch64
-      fetch_artifacts: false
-      release: epel8
-      scratch_build: true
-      target: epel8
-
-- job:
-    name: preview-rpm-build
-    parent: preview-common-koji-rpm-build
-    branches:
-      - master
-    final: true
-    vars:
-      fetch_artifacts: false
-      release: master
-      scratch_build: false
-      target: rawhide
-
-- job:
-    name: preview-rpm-build
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f33
-    final: true
-    vars:
-      fetch_artifacts: false
-      release: f33
-      scratch_build: false
-      target: f33
-
-- job:
-    name: preview-rpm-build
-    parent: preview-common-koji-rpm-build
-    branches:
-      - f32
-    final: true
-    vars:
-      fetch_artifacts: false
-      release: f32
-      scratch_build: false
-      target: f32
-
-- job:
-    name: preview-rpm-build
-    parent: preview-common-koji-rpm-build
-    branches:
-      - epel8
-    final: true
-    vars:
-      fetch_artifacts: false
-      release: epel8
-      scratch_build: false
-      target: epel8
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6504f2c..31bb65e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -12,6 +12,25 @@
       nodes: []
 
 - job:
+    name: check-for-arches
+    description: Check the packages needs arches builds
+    run: playbooks/rpm/check-for-arches.yaml
+    branches:
+      - master
+      - f33
+      - f32
+      - epel8
+    nodeset:
+      nodes: []
+    vars:
+      arch_jobs:
+        - rpm-scratch-build-s390x
+        - rpm-scratch-build-ppc64le
+        - rpm-scratch-build-i686
+        - rpm-scratch-build-armv7hl
+        - rpm-scratch-build-aarch64
+
+- job:
     name: common-koji-rpm-build
     description: Base job for RPM build on Fedora Koji
     run: playbooks/koji/build-ng.yaml
@@ -45,6 +64,8 @@
     parent: common-koji-rpm-build
     branches:
       - master
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: s390x
@@ -58,6 +79,8 @@
     parent: common-koji-rpm-build
     branches:
       - master
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: ppc64le
@@ -71,6 +94,8 @@
     parent: common-koji-rpm-build
     branches:
       - master
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: i686
@@ -84,6 +109,8 @@
     parent: common-koji-rpm-build
     branches:
       - master
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: armv7hl
@@ -97,6 +124,8 @@
     parent: common-koji-rpm-build
     branches:
       - master
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: aarch64
@@ -123,6 +152,8 @@
     parent: common-koji-rpm-build
     branches:
       - f33
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: s390x
@@ -136,6 +167,8 @@
     parent: common-koji-rpm-build
     branches:
       - f33
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: ppc64le
@@ -149,6 +182,8 @@
     parent: common-koji-rpm-build
     branches:
       - f33
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: i686
@@ -162,6 +197,8 @@
     parent: common-koji-rpm-build
     branches:
       - f33
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: armv7hl
@@ -175,6 +212,8 @@
     parent: common-koji-rpm-build
     branches:
       - f33
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: aarch64
@@ -201,6 +240,8 @@
     parent: common-koji-rpm-build
     branches:
       - f32
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: s390x
@@ -214,6 +255,8 @@
     parent: common-koji-rpm-build
     branches:
       - f32
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: ppc64le
@@ -227,6 +270,8 @@
     parent: common-koji-rpm-build
     branches:
       - f32
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: i686
@@ -240,6 +285,8 @@
     parent: common-koji-rpm-build
     branches:
       - f32
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: armv7hl
@@ -253,6 +300,8 @@
     parent: common-koji-rpm-build
     branches:
       - f32
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: aarch64
@@ -279,6 +328,8 @@
     parent: common-koji-rpm-build
     branches:
       - epel8
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: ppc64le
@@ -292,6 +343,8 @@
     parent: common-koji-rpm-build
     branches:
       - epel8
+    dependencies:
+      - check-for-arches
     final: true
     vars:
       arches: aarch64
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 70c9208..97f0edc 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -18,19 +18,6 @@
     name: rpms/python-gear
     templates:
       - publish
-    check:
-      jobs:
-       - preview-check-for-arches
-       - preview-rpm-scratch-build-aarch64:
-           voting: false
-       - preview-rpm-scratch-build-ppc64le:
-           voting: false
-       - preview-rpm-scratch-build-armv7hl:
-           voting: false
-       - preview-rpm-scratch-build-i686:
-           voting: false
-       - preview-rpm-scratch-build-s390x:
-           voting: false
 
 - project:
     name: rpms/python-ws4py
@@ -67,22 +54,6 @@
     templates:
       - publish
 
-# python runtime distgits such as rpms/python3.xx
-- project:
-    name: "^rpms/python3\\.\\d+"
-    check:
-      jobs:
-       - rpm-scratch-build-aarch64:
-           voting: false
-       - rpm-scratch-build-ppc64le:
-           voting: false
-       - rpm-scratch-build-armv7hl:
-           voting: false
-       - rpm-scratch-build-i686:
-           voting: false
-       - rpm-scratch-build-s390x:
-           voting: false
-
 - project:
     name: rpms/pypy
     check: