PR#190: Add support for Epel9 - fedora-project-config

Miroslav Vadkerti • 2 years ago

e6a98cf

FZCI.dhall/Arches.dhall

file modified

		`@@ -20,6 +20,7 @@`
		`, Union.AARCH64`
		`]`
		`, epel8 = [ Union.X86_64, Union.PPC64LE, Union.AARCH64 ]`
		`+ , epel9 = [ Union.X86_64, Union.PPC64LE, Union.AARCH64 ]`
		`, show =`
		`λ(arch : Union) →`
		`merge`

FZCI.dhall/Branches.dhall

file modified

+15 -3

		`@@ -4,10 +4,16 @@`

		let --\| When changing that union, update the `all` attribute too
		`Union =`
		`- < Rawhide \| F34 \| F35 \| F36 \| Epel8 >`
		`+ < Rawhide \| F34 \| F35 \| F36 \| Epel8 \| Epel9 >`

		`let eq_def =`
		`- { Rawhide = False, F34 = False, F35 = False, F36 = False, Epel8 = False }`
		`+ { Rawhide = False`
		`+ , F34 = False`
		`+ , F35 = False`
		`+ , F36 = False`
		`+ , Epel8 = False`
		`+ , Epel9 = False`
		`+ }`

		`let show =`
		`λ(branch : Union) →`
		`@@ -17,10 +23,11 @@`
		`, F35 = "f35"`
		`, F36 = "f36"`
		`, Epel8 = "epel8"`
		`+ , Epel9 = "epel9"`
		`}`
		`branch`

		`- let all = [ Union.Rawhide, Union.F36, Union.F35, Union.F34, Union.Epel8 ]`
		`+ let all = [ Union.Rawhide, Union.F36, Union.F35, Union.F34, Union.Epel8, Union.Epel9 ]`

		`let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch`

		`@@ -46,6 +53,7 @@`
		`, F35 = "f35"`
		`, F36 = "f36"`
		`, Epel8 = "epel8"`
		`+ , Epel9 = "epel9"`
		`}`
		`branch`
		`, arches =`
		`@@ -62,6 +70,7 @@`
		`, F35 = Arches.fedora`
		`, F36 = Arches.fedora`
		`, Epel8 = Arches.epel8`
		`+ , Epel9 = Arches.epel9`
		`}`
		`branch`
		`, kojirepos =`
		`@@ -77,8 +86,11 @@`
		`"https://kojipkgs.fedoraproject.org/repos/f36-build/latest/x86_64/"`
		`, Epel8 =`
		`"https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/x86_64/"`
		`+ , Epel9 =`
		`+ "https://kojipkgs.fedoraproject.org/repos/epel9-build/latest/x86_64/"`
		`}`
		`branch`
		`, isRawhide`
		`, isEpel8 = λ(branch : Union) → merge (eq_def ⫽ { Epel8 = True }) branch`
		`+ , isEpel9 = λ(branch : Union) → merge (eq_def ⫽ { Epel9 = True }) branch`
		`}`

FZCI.dhall/Nodesets.dhall

file modified

		`@@ -32,6 +32,7 @@`
		`\| Fedora-31-VM-Medium`
		`\| Fedora-30-VM-Medium`
		`\| Centos-8-VM`
		`+ \| Centos-Stream-9-VM`
		`>`

		`let all =`
		`@@ -63,6 +64,7 @@`
		`, Union.Fedora-31-VM-Medium`
		`, Union.Fedora-30-VM-Medium`
		`, Union.Centos-8-VM`
		`+ , Union.Centos-Stream-9-VM`
		`]`

		`let create`
		`@@ -171,6 +173,8 @@`
		`"cloud-host"`
		`, Centos-8-VM =`
		`create "centos-8-vm" "cloud-centos-8" "cloud-host"`
		`+ , Centos-Stream-9-VM =`
		`+ create "centos-stream-9-vm" "cloud-centos-9-stream" "cloud-host"`
		`}`
		`nodeset`

file modified

FZCI.dhall/fedora-zuul-jobs/jobs.dhall

file modified

+12

		`@@ -39,6 +39,7 @@`
		`, F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium`
		`, F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM`
		`, Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM`
		`+ , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM`
		`}`
		`branch`

		`@@ -60,6 +61,11 @@`
		`then job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }`
		`else job`

		`+ let job =`
		`+ if Branches.isEpel9 branch`
		`+ then job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }`
fbo commented 2 years ago The playbook is misnamed but it install epel-release package so I guess that's ok ?
		`+ else job`
		`+`
		`in job`

		`let createRpmTestJob`
		`@@ -74,6 +80,7 @@`
		`, F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium`
		`, F36 = Nodesets.getName Nodesets.Type.Fedora-36-VM-Medium`
		`, Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM`
		`+ , Epel9 = Nodesets.getName Nodesets.Type.Centos-Stream-9-VM`
		`}`
		`branch`

		`@@ -98,6 +105,11 @@`
		`then job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }`
		`else job`

		`+ let job =`
		`+ if Branches.isEpel9 branch`
		`+ then job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }`
		`+ else job`
		`+`
		`in job`

		`let createRpmInspectJob`