From 57f08afada91bbcd12553c9d19cd3def9c11162c Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jan 11 2021 15:29:28 +0000
Subject: check-for-arches: use container instead of zuul executor to exec the job


An up to date rpmspec tool is required for some specfiles and the centos7 one
we run on the Zuul executor is quite old.

For instance we got in trouble with rpms/clang where:

On ze01:
[centos@ze01.softwarefactory-project.io clang]$ rpmspec -q clang.spec
error: line 182: Unknown tag: Recommends: compiler-rt(x86-64) = 11.0.1
error: query of specfile clang.spec failed, can't parse

on F33:
[root@bb8244ede238 clang]# rpmspec -q clang.spec
clang-11.0.1-4.fc33.x86_64
clang-libs-11.0.1-4.fc33.x86_64
...

---

diff --git a/playbooks/rpm/check-for-arches.yaml b/playbooks/rpm/check-for-arches.yaml
index 2e2a53c..b52a56f 100644
--- a/playbooks/rpm/check-for-arches.yaml
+++ b/playbooks/rpm/check-for-arches.yaml
@@ -1,4 +1,4 @@
-- hosts: localhost
+- hosts: all
   tasks:
     - name: Check for noarch
       command: sh -c "rpm --specfile *.spec 2> stderr.log | rev | cut -d'.' -f 1 | rev | grep -v '^noarch$'"
diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index 61d739d..3810e7c 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -148,6 +148,8 @@ let executor_nodeset =
       Zuul.Nodeset.Inline
         Zuul.Nodeset::{ nodes = [] : List Zuul.Nodeset.NodeType }
 
+let default_nodeset = Zuul.Nodeset.Name "fedora-33-container"
+
 let check_for_tests =
       Zuul.Job::{
       , name = Some "${job-prefix}check-for-tests"
@@ -177,7 +179,7 @@ let check_for_arches =
                   }
               )
           )
-      , nodeset = Some executor_nodeset
+      , nodeset = Some default_nodeset
       }
 
 let common_koji_rpm_build =
@@ -187,7 +189,7 @@ let common_koji_rpm_build =
       , protected = Some True
       , description = Some "Base job for RPM build on Fedora Koji"
       , timeout = Some 21600
-      , nodeset = Some (Zuul.Nodeset.Name "fedora-33-container")
+      , nodeset = Some default_nodeset
       , roles = Some [ { zuul = "zuul-distro-jobs" } ]
       , run = Some "playbooks/koji/build-ng.yaml"
       , provides = Some [ "${job-prefix}repo" ]
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 31bb65e..c0e4c1e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -20,8 +20,7 @@
       - f33
       - f32
       - epel8
-    nodeset:
-      nodes: []
+    nodeset: fedora-33-container
     vars:
       arch_jobs:
         - rpm-scratch-build-s390x