From 6321f1eceb6544ba6b79c92e1f31b7bdc6a12c37 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Nov 21 2024 07:59:30 +0000
Subject: Switch to the new check-for-arches


---

diff --git a/playbooks/rpm/check-for-arches-ng.yaml b/playbooks/rpm/check-for-arches-ng.yaml
index b0fdf15..295b030 100644
--- a/playbooks/rpm/check-for-arches-ng.yaml
+++ b/playbooks/rpm/check-for-arches-ng.yaml
@@ -22,10 +22,7 @@
     - name: Show discover-arches stderr
       ansible.builtin.shell: touch /tmp/discover-arches.stderr && cat /tmp/discover-arches.stderr
 
-    # - zuul_return:
-    #     data:
-    #       zuul:
-    #         child_jobs: "{{ cmd_out.stdout | from_json }}"
-
-    - ansible.builtin.debug:
-        msg: "{{ cmd_out.stdout | from_json }}"
+    - zuul_return:
+        data:
+          zuul:
+            child_jobs: "{{ cmd_out.stdout | from_json }}"
diff --git a/playbooks/rpm/check-for-arches.yaml b/playbooks/rpm/check-for-arches.yaml
deleted file mode 100644
index 1feb30e..0000000
--- a/playbooks/rpm/check-for-arches.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-- 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$'"
-      register: tests_noarch
-      failed_when: false
-      args:
-        chdir: "{{ zuul.project.src_dir }}"
-
-    - name: Show stderr
-      command: cat stderr.log
-      failed_when: false
-      args:
-        chdir: "{{ zuul.project.src_dir }}"
-
-    - zuul_return:
-        data:
-          zuul:
-            child_jobs: "{{ arch_jobs }}"
-      when: check_for_arches_ignore or tests_noarch.stdout_lines != []
-
-    - zuul_return:
-        data:
-          zuul:
-            child_jobs:
-              - noop
-      when: (not check_for_arches_ignore) and tests_noarch.stdout_lines == []
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 33c897e..be4381b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -45,27 +45,6 @@
 - job:
     name: check-for-arches
     description: Check the packages needs arches builds
-    run: playbooks/rpm/check-for-arches.yaml
-    branches:
-      - rawhide
-      - f40
-      - f41
-      - f39
-      - epel9
-      - epel9-next
-      - main
-    nodeset: fedora-40-container
-    vars:
-      arch_jobs:
-        - rpm-scratch-build-s390x
-        - rpm-scratch-build-ppc64le
-        - rpm-scratch-build-i686
-        - rpm-scratch-build-aarch64
-      check_for_arches_ignore: false
-
-- job:
-    name: check-for-arches-ng
-    description: Check the packages needs arches builds
     run: playbooks/rpm/check-for-arches-ng.yaml
     branches:
       - rawhide