PR#135: Add support for F36 branch and remobe F33 - fedora-zuul-jobs

fedora-zuul-jobs

#135 Add support for F36 branch and remobe F33

Merged 2 years ago by zuul. Opened 2 years ago by fbo.

fbo/fedora-zuul-jobs f36 into master

Add support for F36 branch and remobe F33

Fabien Boucher • 2 years ago

4bb36a7

zuul.d/jobs.dhall

file modified

+3 -2

		`@@ -46,9 +46,9 @@`
		`λ(branch : Branches.Type) →`
		`merge`
		`{ Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM`
		`- , F33 = Nodesets.getName Nodesets.Type.Fedora-33-Container`
		`, F34 = Nodesets.getName Nodesets.Type.Fedora-34-Container`
		`, F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium`
		`+ , F36 = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM`
		`, Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM`
		`}`
		`branch`
		`@@ -81,9 +81,10 @@`
		`merge`
		`{ Rawhide =`
		`Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium`
		`- , F33 = Nodesets.getName Nodesets.Type.Fedora-33-VM-Medium`
		`, F34 = Nodesets.getName Nodesets.Type.Fedora-34-VM-Medium`
		`, F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium`
		`+ , F36 =`
		`+ Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium`
		`, Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM`
		`}`
		`branch`

zuul.d/jobs.yaml

file modified

+34 -34

		`@@ -19,11 +19,11 @@`

		`- job:`
		`name: rpm-install-test`
		`- description: "Install the built rpms (f35 variant)"`
		`+ description: "Install the built rpms (f36 variant)"`
		`run: playbooks/rpm/rpm-install-test.yaml`
		`branches:`
		`- - f35`
		`- nodeset: fedora-35-vm-medium`
		`+ - f36`
		`+ nodeset: fedora-rawhide-vm`
		`requires:`
		`- repo`
		`roles:`
		`@@ -31,15 +31,15 @@`
		`vars:`
		`repos:`
		`- name: distro-build`
		`- url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/`
		`+ url: https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/`

		`- job:`
		`name: rpm-install-test`
		`- description: "Install the built rpms (f34 variant)"`
		`+ description: "Install the built rpms (f35 variant)"`
		`run: playbooks/rpm/rpm-install-test.yaml`
		`branches:`
		`- - f34`
		`- nodeset: fedora-34-container`
		`+ - f35`
		`+ nodeset: fedora-35-vm-medium`
		`requires:`
		`- repo`
		`roles:`
		`@@ -47,15 +47,15 @@`
		`vars:`
		`repos:`
		`- name: distro-build`
		`- url: https://kojipkgs.fedoraproject.org/repos/f34-build/latest/x86_64/`
		`+ url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/`

		`- job:`
		`name: rpm-install-test`
		`- description: "Install the built rpms (f33 variant)"`
		`+ description: "Install the built rpms (f34 variant)"`
		`run: playbooks/rpm/rpm-install-test.yaml`
		`branches:`
		`- - f33`
		`- nodeset: fedora-33-container`
		`+ - f34`
		`+ nodeset: fedora-34-container`
		`requires:`
		`- repo`
		`roles:`
		`@@ -63,7 +63,7 @@`
		`vars:`
		`repos:`
		`- name: distro-build`
		`- url: https://kojipkgs.fedoraproject.org/repos/f33-build/latest/x86_64/`
		`+ url: https://kojipkgs.fedoraproject.org/repos/f34-build/latest/x86_64/`

		`- job:`
		`name: rpm-install-test`
		`@@ -105,13 +105,13 @@`

		`- job:`
		`name: rpm-test`
		`- description: "Install the built rpms and run STI tests (f35 variant)"`
		`+ description: "Install the built rpms and run STI tests (f36 variant)"`
		`run: playbooks/rpm/rpmtest.yaml`
		`post-run:`
		`- playbooks/rpm/rpmtest-fetch-artifacts.yaml`
		`branches:`
		`- - f35`
		`- nodeset: fedora-35-vm-medium`
		`+ - f36`
		`+ nodeset: fedora-rawhide-vm-medium`
		`requires:`
		`- repo`
		`roles:`
		`@@ -120,17 +120,17 @@`
		`vars:`
		`repos:`
		`- name: distro-build`
		`- url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/`
		`+ url: https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/`

		`- job:`
		`name: rpm-test`
		`- description: "Install the built rpms and run STI tests (f34 variant)"`
		`+ description: "Install the built rpms and run STI tests (f35 variant)"`
		`run: playbooks/rpm/rpmtest.yaml`
		`post-run:`
		`- playbooks/rpm/rpmtest-fetch-artifacts.yaml`
		`branches:`
		`- - f34`
		`- nodeset: fedora-34-vm-medium`
		`+ - f35`
		`+ nodeset: fedora-35-vm-medium`
		`requires:`
		`- repo`
		`roles:`
		`@@ -139,17 +139,17 @@`
		`vars:`
		`repos:`
		`- name: distro-build`
		`- url: https://kojipkgs.fedoraproject.org/repos/f34-build/latest/x86_64/`
		`+ url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/`

		`- job:`
		`name: rpm-test`
		`- description: "Install the built rpms and run STI tests (f33 variant)"`
		`+ description: "Install the built rpms and run STI tests (f34 variant)"`
		`run: playbooks/rpm/rpmtest.yaml`
		`post-run:`
		`- playbooks/rpm/rpmtest-fetch-artifacts.yaml`
		`branches:`
		`- - f33`
		`- nodeset: fedora-33-vm-medium`
		`+ - f34`
		`+ nodeset: fedora-34-vm-medium`
		`requires:`
		`- repo`
		`roles:`
		`@@ -158,7 +158,7 @@`
		`vars:`
		`repos:`
		`- name: distro-build`
		`- url: https://kojipkgs.fedoraproject.org/repos/f33-build/latest/x86_64/`
		`+ url: https://kojipkgs.fedoraproject.org/repos/f34-build/latest/x86_64/`

		`- job:`
		`name: rpm-test`
		`@@ -199,44 +199,44 @@`
		`- job:`
		`name: rpm-rpminspect`
		`parent: rpminspect`
		`- description: "Run the rpminspect report tests (f35 variant)"`
		`+ description: "Run the rpminspect report tests (f36 variant)"`
		`branches:`
		`- - f35`
		`+ - f36`
		`nodeset: fedora-34-container`
		`requires:`
		`- repo`
		`vars:`
		`check_previous_build_enabled: true`
		`rpminspect_cmd: rpminspect-fedora`
		`- target: f35`
		`+ target: f36`

		`- job:`
		`name: rpm-rpminspect`
		`parent: rpminspect`
		`- description: "Run the rpminspect report tests (f34 variant)"`
		`+ description: "Run the rpminspect report tests (f35 variant)"`
		`branches:`
		`- - f34`
		`+ - f35`
		`nodeset: fedora-34-container`
		`requires:`
		`- repo`
		`vars:`
		`check_previous_build_enabled: true`
		`rpminspect_cmd: rpminspect-fedora`
		`- target: f34`
		`+ target: f35`

		`- job:`
		`name: rpm-rpminspect`
		`parent: rpminspect`
		`- description: "Run the rpminspect report tests (f33 variant)"`
		`+ description: "Run the rpminspect report tests (f34 variant)"`
		`branches:`
		`- - f33`
		`+ - f34`
		`nodeset: fedora-34-container`
		`requires:`
		`- repo`
		`vars:`
		`check_previous_build_enabled: true`
		`rpminspect_cmd: rpminspect-fedora`
		`- target: f33`
		`+ target: f34`

		`- job:`
		`name: rpm-rpminspect`
		`@@ -257,9 +257,9 @@`
		`parent: repo-rpm-lint`
		`branches:`
		`- rawhide`
		`+ - f36`
		`- f35`
		`- f34`
		`- - f33`
		`- epel8`
		`- main`
		`nodeset: fedora-34-container`