PR#105: Update branch matcher to use the new name - fedora-zuul-jobs-config

fedora-zuul-jobs-config

#105 Update branch matcher to use the new name

Merged 3 years ago by zuul. Opened 3 years ago by tdecacqu.

tdecacqu/fedora-zuul-jobs-config master into master

Update branch matcher to use the new name

Tristan Cacqueray • 3 years ago

53c6393

zuul.d/jobs.dhall

file modified

+1 -2

		`@@ -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`
		`@@ -170,7 +169,7 @@`
		`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)`

zuul.d/jobs.yaml

file modified

+26 -16

		`@@ -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`