From 4f9c5f78ab65f01974d6f8ded3d5f65bc3bef829 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Jan 05 2021 16:07:26 +0000
Subject: Prettify the jobs.yaml and update documentation


---

diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index caaa0fa..7052bf6 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -4,7 +4,12 @@ This Dhall definition helps to maintain the jobs.yaml definition for Zuul.
 The Dhall-Zuul library is used to benefit base Dhall type and function for Zuul
 objects.
 
-To compute the jobs.yaml run: dhall-to-yaml --file jobs.dhall > jobs.yaml
+To compute the jobs.yaml run:
+
+  dhall-to-yaml --file jobs.dhall | zuulfmt > jobs.yaml
+
+Install dhall by following https://docs.dhall-lang.org/tutorials/Getting-started_Generate-JSON-or-YAML.html#installation
+Install zuulfmt by running: `python3 -mpip install --user zuulfmt`
 
 -}
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index f6c5839..6aa4c43 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,321 +1,347 @@
 
 - job:
+    name: check-for-tests
+    description: Check the project has a tests/tests.yml
+    run: playbooks/rpm/check-for-tests.yaml
     branches:
       - master
       - f33
       - f32
       - epel8
-    description: Check the project has a tests/tests.yml
-    name: check-for-tests
     nodeset:
       nodes: []
-    run: playbooks/rpm/check-for-tests.yaml
+
 - job:
-    abstract: true
-    description: Base job for RPM build on Fedora Koji
     name: 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:
       - repo
     roles:
       - zuul: zuul-distro-jobs
-    run: playbooks/koji/build-ng.yaml
     secrets:
       - name: krb_keytab
         secret: krb_keytab
     timeout: 21600
+
 - job:
+    name: rpm-scratch-build
+    parent: common-koji-rpm-build
     branches:
       - master
     final: true
-    name: rpm-scratch-build
-    parent: common-koji-rpm-build
     vars:
       arches: x86_64
       fetch_artifacts: true
       release: master
       scratch_build: true
       target: rawhide
+
 - job:
+    name: rpm-scratch-build-s390x
+    parent: common-koji-rpm-build
     branches:
       - master
     final: true
-    name: rpm-scratch-build-s390x
-    parent: common-koji-rpm-build
     vars:
       arches: s390x
       fetch_artifacts: false
       release: master
       scratch_build: true
       target: rawhide
+
 - job:
+    name: rpm-scratch-build-ppc64le
+    parent: common-koji-rpm-build
     branches:
       - master
     final: true
-    name: rpm-scratch-build-ppc64le
-    parent: common-koji-rpm-build
     vars:
       arches: ppc64le
       fetch_artifacts: false
       release: master
       scratch_build: true
       target: rawhide
+
 - job:
+    name: rpm-scratch-build-i386
+    parent: common-koji-rpm-build
     branches:
       - master
     final: true
-    name: rpm-scratch-build-i386
-    parent: common-koji-rpm-build
     vars:
       arches: i386
       fetch_artifacts: false
       release: master
       scratch_build: true
       target: rawhide
+
 - job:
+    name: rpm-scratch-build-armhfp
+    parent: common-koji-rpm-build
     branches:
       - master
     final: true
-    name: rpm-scratch-build-armhfp
-    parent: common-koji-rpm-build
     vars:
       arches: armhfp
       fetch_artifacts: false
       release: master
       scratch_build: true
       target: rawhide
+
 - job:
+    name: rpm-scratch-build-aarch64
+    parent: common-koji-rpm-build
     branches:
       - master
     final: true
-    name: rpm-scratch-build-aarch64
-    parent: common-koji-rpm-build
     vars:
       arches: aarch64
       fetch_artifacts: false
       release: master
       scratch_build: true
       target: rawhide
+
 - job:
+    name: rpm-scratch-build
+    parent: common-koji-rpm-build
     branches:
       - f33
     final: true
-    name: rpm-scratch-build
-    parent: common-koji-rpm-build
     vars:
       arches: x86_64
       fetch_artifacts: true
       release: f33
       scratch_build: true
       target: f33
+
 - job:
+    name: rpm-scratch-build-s390x
+    parent: common-koji-rpm-build
     branches:
       - f33
     final: true
-    name: rpm-scratch-build-s390x
-    parent: common-koji-rpm-build
     vars:
       arches: s390x
       fetch_artifacts: false
       release: f33
       scratch_build: true
       target: f33
+
 - job:
+    name: rpm-scratch-build-ppc64le
+    parent: common-koji-rpm-build
     branches:
       - f33
     final: true
-    name: rpm-scratch-build-ppc64le
-    parent: common-koji-rpm-build
     vars:
       arches: ppc64le
       fetch_artifacts: false
       release: f33
       scratch_build: true
       target: f33
+
 - job:
+    name: rpm-scratch-build-i386
+    parent: common-koji-rpm-build
     branches:
       - f33
     final: true
-    name: rpm-scratch-build-i386
-    parent: common-koji-rpm-build
     vars:
       arches: i386
       fetch_artifacts: false
       release: f33
       scratch_build: true
       target: f33
+
 - job:
+    name: rpm-scratch-build-armhfp
+    parent: common-koji-rpm-build
     branches:
       - f33
     final: true
-    name: rpm-scratch-build-armhfp
-    parent: common-koji-rpm-build
     vars:
       arches: armhfp
       fetch_artifacts: false
       release: f33
       scratch_build: true
       target: f33
+
 - job:
+    name: rpm-scratch-build-aarch64
+    parent: common-koji-rpm-build
     branches:
       - f33
     final: true
-    name: rpm-scratch-build-aarch64
-    parent: common-koji-rpm-build
     vars:
       arches: aarch64
       fetch_artifacts: false
       release: f33
       scratch_build: true
       target: f33
+
 - job:
+    name: rpm-scratch-build
+    parent: common-koji-rpm-build
     branches:
       - f32
     final: true
-    name: rpm-scratch-build
-    parent: common-koji-rpm-build
     vars:
       arches: x86_64
       fetch_artifacts: true
       release: f32
       scratch_build: true
       target: f32
+
 - job:
+    name: rpm-scratch-build-s390x
+    parent: common-koji-rpm-build
     branches:
       - f32
     final: true
-    name: rpm-scratch-build-s390x
-    parent: common-koji-rpm-build
     vars:
       arches: s390x
       fetch_artifacts: false
       release: f32
       scratch_build: true
       target: f32
+
 - job:
+    name: rpm-scratch-build-ppc64le
+    parent: common-koji-rpm-build
     branches:
       - f32
     final: true
-    name: rpm-scratch-build-ppc64le
-    parent: common-koji-rpm-build
     vars:
       arches: ppc64le
       fetch_artifacts: false
       release: f32
       scratch_build: true
       target: f32
+
 - job:
+    name: rpm-scratch-build-i386
+    parent: common-koji-rpm-build
     branches:
       - f32
     final: true
-    name: rpm-scratch-build-i386
-    parent: common-koji-rpm-build
     vars:
       arches: i386
       fetch_artifacts: false
       release: f32
       scratch_build: true
       target: f32
+
 - job:
+    name: rpm-scratch-build-armhfp
+    parent: common-koji-rpm-build
     branches:
       - f32
     final: true
-    name: rpm-scratch-build-armhfp
-    parent: common-koji-rpm-build
     vars:
       arches: armhfp
       fetch_artifacts: false
       release: f32
       scratch_build: true
       target: f32
+
 - job:
+    name: rpm-scratch-build-aarch64
+    parent: common-koji-rpm-build
     branches:
       - f32
     final: true
-    name: rpm-scratch-build-aarch64
-    parent: common-koji-rpm-build
     vars:
       arches: aarch64
       fetch_artifacts: false
       release: f32
       scratch_build: true
       target: f32
+
 - job:
+    name: rpm-scratch-build
+    parent: common-koji-rpm-build
     branches:
       - epel8
     final: true
-    name: rpm-scratch-build
-    parent: common-koji-rpm-build
     vars:
       arches: x86_64
       fetch_artifacts: true
       release: epel8
       scratch_build: true
       target: epel8
+
 - job:
+    name: rpm-scratch-build-ppc64le
+    parent: common-koji-rpm-build
     branches:
       - epel8
     final: true
-    name: rpm-scratch-build-ppc64le
-    parent: common-koji-rpm-build
     vars:
       arches: ppc64le
       fetch_artifacts: false
       release: epel8
       scratch_build: true
       target: epel8
+
 - job:
+    name: rpm-scratch-build-aarch64
+    parent: common-koji-rpm-build
     branches:
       - epel8
     final: true
-    name: rpm-scratch-build-aarch64
-    parent: common-koji-rpm-build
     vars:
       arches: aarch64
       fetch_artifacts: false
       release: epel8
       scratch_build: true
       target: epel8
+
 - job:
+    name: rpm-build
+    parent: common-koji-rpm-build
     branches:
       - master
     final: true
-    name: rpm-build
-    parent: common-koji-rpm-build
     vars:
       fetch_artifacts: false
       release: master
       scratch_build: false
       target: rawhide
+
 - job:
+    name: rpm-build
+    parent: common-koji-rpm-build
     branches:
       - f33
     final: true
-    name: rpm-build
-    parent: common-koji-rpm-build
     vars:
       fetch_artifacts: false
       release: f33
       scratch_build: false
       target: f33
+
 - job:
+    name: rpm-build
+    parent: common-koji-rpm-build
     branches:
       - f32
     final: true
-    name: rpm-build
-    parent: common-koji-rpm-build
     vars:
       fetch_artifacts: false
       release: f32
       scratch_build: false
       target: f32
+
 - job:
+    name: rpm-build
+    parent: common-koji-rpm-build
     branches:
       - epel8
     final: true
-    name: rpm-build
-    parent: common-koji-rpm-build
     vars:
       fetch_artifacts: false
       release: epel8