#98 Update branch matcher to use the new name
Merged 2 months ago by zuul. Opened 2 months ago by tdecacqu.
tdecacqu/fedora-zuul-jobs master  into  master

file modified
+5 -6
@@ -12,7 +12,6 @@ 

  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
@@ -49,7 +48,7 @@ 

          let getNodesetByBranch =

                λ(branch : Branches.Type) →

                  merge

-                   { Master = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM

+                   { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM

                    , F32 = Nodesets.getName Nodesets.Type.Fedora-32-Container

                    , F33 = Nodesets.getName Nodesets.Type.Fedora-33-Container

                    , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
@@ -64,7 +63,7 @@ 

                , roles = Some [ { zuul = "zuul-distro-jobs" } ]

                , requires = Some [ "repo" ]

                , run = Some "playbooks/rpm/rpm-install-test.yaml"

-               , branches = Some [ Branches.show branch ]

+               , branches = Branches.zuulBranch branch

                , nodeset = Some (getNodesetByBranch branch)

                , vars = Some (createJobVars (Branches.kojirepos branch))

                }
@@ -82,7 +81,7 @@ 

          let getNodesetByBranch =

                λ(branch : Branches.Type) →

                  merge

-                   { Master =

+                   { Rawhide =

                        Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium

                    , F32 = Nodesets.getName Nodesets.Type.Fedora-32-VM-Medium

                    , F33 = Nodesets.getName Nodesets.Type.Fedora-33-VM-Medium
@@ -101,7 +100,7 @@ 

                , requires = Some [ "repo" ]

                , run = Some "playbooks/rpm/rpmtest.yaml"

                , post-run = Some [ "playbooks/rpm/rpmtest-fetch-artifacts.yaml" ]

-               , branches = Some [ Branches.show branch ]

+               , branches = Branches.zuulBranch branch

                , nodeset = Some (getNodesetByBranch branch)

                , vars = Some (createJobVars (Branches.kojirepos branch))

                }
@@ -124,7 +123,7 @@ 

                                                          branch} variant)"

                , parent = Some "rpminspect"

                , requires = Some [ "repo" ]

-               , branches = Some [ Branches.show branch ]

+               , branches = Branches.zuulBranch branch

                , nodeset = Some

                    (Nodesets.getName Nodesets.Type.Fedora-33-Container)

                , vars = Some

file modified
+11 -7
@@ -2,10 +2,11 @@ 

  

  - job:

      name: rpm-install-test

-     description: "Install the built rpms (master variant)"

+     description: "Install the built rpms (rawhide variant)"

      run: playbooks/rpm/rpm-install-test.yaml

      branches:

-       - master

+       - rawhide

+       - main

      nodeset: fedora-rawhide-vm

      requires:

        - repo
@@ -68,12 +69,13 @@ 

  

  - job:

      name: rpm-test

-     description: "Install the built rpms and run STI tests (master variant)"

+     description: "Install the built rpms and run STI tests (rawhide variant)"

      run: playbooks/rpm/rpmtest.yaml

      post-run:

        - playbooks/rpm/rpmtest-fetch-artifacts.yaml

      branches:

-       - master

+       - rawhide

+       - main

      nodeset: fedora-rawhide-vm-medium

      requires:

        - repo
@@ -147,9 +149,10 @@ 

  - job:

      name: rpm-rpminspect

      parent: rpminspect

-     description: "Run the rpminspect report tests (master variant)"

+     description: "Run the rpminspect report tests (rawhide variant)"

      branches:

-       - master

+       - rawhide

+       - main

      nodeset: fedora-33-container

      requires:

        - repo
@@ -204,10 +207,11 @@ 

      name: rpm-linter

      parent: repo-rpm-lint

      branches:

-       - master

+       - rawhide

        - f33

        - f32

        - epel8

+       - main

      nodeset: fedora-33-container

      requires:

        - repo

file modified
+5 -5
@@ -1,6 +1,7 @@ 

  # Code generated by dhall-to-yaml.  DO NOT EDIT.

  

  - project-template:

+     name: build

      check:

        jobs:

          - check-for-arches
@@ -15,9 +16,9 @@ 

              voting: false

          - rpm-scratch-build-aarch64:

              voting: false

-     name: build

  

  - project-template:

+     name: lint

      check:

        jobs:

          - rpm-linter:
@@ -27,9 +28,9 @@ 

              dependencies:

                - rpm-scratch-build

              voting: false

-     name: lint

  

  - project-template:

+     name: test

      check:

        jobs:

          - check-for-tests:
@@ -43,19 +44,18 @@ 

              dependencies:

                - check-for-tests

                - rpm-scratch-build

-     name: test

  

  - project-template:

+     name: publish

      gate:

        jobs:

          - noop

-     name: publish

      promote:

        jobs:

          - rpm-build

  

  - project-template:

+     name: test-tests-def

      check:

        jobs:

          - rpm-test

-     name: test-tests-def

Build succeeded.

Metadata Update from @fbo:
- Pull-request tagged with: gateit

2 months ago

Build succeeded (gate pipeline).

Pull-Request has been merged by zuul

2 months ago