From 53c639372ed209e893a1cd3a7f44112d324a4d67 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Feb 03 2021 16:59:21 +0000
Subject: Update branch matcher to use the new name


Depends-On: https://pagure.io/fedora-project-config/pull-request/126

---

diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index 7a918ba..caed587 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -12,7 +12,6 @@ Install dhall by following https://docs.dhall-lang.org/tutorials/Getting-started
 Install zuulfmt by running: `python3 -mpip install --user zuulfmt`
 
 -}
-
 let Zuul =
         ~/git/softwarefactory-project.io/software-factory/dhall-zuul/package.dhall
       ? https://softwarefactory-project.io/cgit/software-factory/dhall-zuul/plain/package.dhall
@@ -170,7 +169,7 @@ let generateRpmBuildJob =
             then  None (List Zuul.Job.Dependency.Union)
             else  Some
                     [ Zuul.Job.Dependency.Name "${job-prefix}check-for-arches" ]
-        , branches = Some [ Branches.show branch ]
+        , branches = Branches.zuulBranch branch
         , vars = Some
             ( setVars
                 (Branches.target branch)
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 46c1cb5..13f1d0b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,13 +1,15 @@
+# Code generated by dhall-to-yaml.  DO NOT EDIT.
 
 - job:
     name: check-for-tests
     description: Check the project has a tests/tests.yml
     run: playbooks/rpm/check-for-tests.yaml
     branches:
-      - master
+      - rawhide
       - f33
       - f32
       - epel8
+      - main
     nodeset:
       nodes: []
 
@@ -16,10 +18,11 @@
     description: Check the packages needs arches builds
     run: playbooks/rpm/check-for-arches.yaml
     branches:
-      - master
+      - rawhide
       - f33
       - f32
       - epel8
+      - main
     nodeset: fedora-33-container
     vars:
       arch_jobs:
@@ -47,14 +50,15 @@
     name: rpm-scratch-build
     parent: common-koji-rpm-build
     branches:
-      - master
+      - rawhide
+      - main
     final: true
     provides:
       - repo
     vars:
       arches: x86_64
       fetch_artifacts: true
-      release: master
+      release: rawhide
       scratch_build: true
       target: rawhide
 
@@ -62,14 +66,15 @@
     name: rpm-scratch-build-s390x
     parent: common-koji-rpm-build
     branches:
-      - master
+      - rawhide
+      - main
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: s390x
       fetch_artifacts: false
-      release: master
+      release: rawhide
       scratch_build: true
       target: rawhide
 
@@ -77,14 +82,15 @@
     name: rpm-scratch-build-ppc64le
     parent: common-koji-rpm-build
     branches:
-      - master
+      - rawhide
+      - main
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: ppc64le
       fetch_artifacts: false
-      release: master
+      release: rawhide
       scratch_build: true
       target: rawhide
 
@@ -92,14 +98,15 @@
     name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
-      - master
+      - rawhide
+      - main
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: i686
       fetch_artifacts: false
-      release: master
+      release: rawhide
       scratch_build: true
       target: rawhide
 
@@ -107,14 +114,15 @@
     name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
-      - master
+      - rawhide
+      - main
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: armv7hl
       fetch_artifacts: false
-      release: master
+      release: rawhide
       scratch_build: true
       target: rawhide
 
@@ -122,14 +130,15 @@
     name: rpm-scratch-build-aarch64
     parent: common-koji-rpm-build
     branches:
-      - master
+      - rawhide
+      - main
     dependencies:
       - check-for-arches
     final: true
     vars:
       arches: aarch64
       fetch_artifacts: false
-      release: master
+      release: rawhide
       scratch_build: true
       target: rawhide
 
@@ -362,11 +371,12 @@
     name: rpm-build
     parent: common-koji-rpm-build
     branches:
-      - master
+      - rawhide
+      - main
     final: true
     vars:
       fetch_artifacts: false
-      release: master
+      release: rawhide
       scratch_build: false
       target: rawhide