PR#992: Setup for rawhide being F35 - pungi-fedora

pungi-fedora

#992 Setup for rawhide being F35

Merged 3 years ago by mohanboddu. Opened 3 years ago by humaton.

humaton/pungi-fedora rawhide_to_f35 into main

Setup for rawhide being F34

Tomas Hrcka • 3 years ago

b00e860

fedora.conf

file modified

+9 -9

		`@@ -34,7 +34,7 @@`
		`# RUNROOT settings`
		`runroot_method = 'koji'`
		`runroot_channel = 'compose'`
		`- runroot_tag = 'f34-build'`
		`+ runroot_tag = 'f35-build'`

		`# PKGSET`
		`pkgset_source = 'koji' # koji, repos`
		`@@ -44,7 +44,7 @@`
		`# pkgset_repos = {}`

		`# PKGSET - KOJI`
		`- pkgset_koji_tag = 'f34'`
		`+ pkgset_koji_tag = 'f35'`
		`pkgset_koji_inherit = False`

		`filter_system_release_packages = False`
		`@@ -306,7 +306,7 @@`
		`global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'`
		`global_version = 'Rawhide'`
		`# live_images ignores this in favor of live_target`
		`- global_target = 'f34'`
		`+ global_target = 'f35'`

		`image_build = {`
		`'^Container$': [`
		`@@ -326,7 +326,7 @@`
		`'factory-parameters': {`
		`'dockerversion': "1.10.1",`
		`'docker_cmd': '[ "/bin/bash" ]',`
		`- 'docker_env': '[ "DISTTAG=f34container", "FGC=f34", "container=oci" ]',`
		`+ 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',`
		`'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',`
		`},`
		`},`
		`@@ -346,7 +346,7 @@`
		`'factory-parameters': {`
		`'dockerversion': "1.10.1",`
		`'docker_cmd': '[ "/bin/bash" ]',`
		`- 'docker_env': '[ "DISTTAG=f34container", "FGC=f34", "container=oci" ]',`
		`+ 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',`
		`'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',`
		`},`
		`}`
		`@@ -689,7 +689,7 @@`
		`})`
		`]`

		`- live_target = 'f34'`
		`+ live_target = 'f35'`
		`live_images_no_rename = True`
		`# fomat: [(variant_uid_regex, {arch\|*: scm_dict})]`
		`live_images = [`
		`@@ -811,7 +811,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-34-primary",`
		`+ "ostree_oskey=fedora-35-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/x86_64/silverblue",`
		`"ostree_update_ref=fedora/rawhide/x86_64/silverblue",`
		`@@ -837,7 +837,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-34-primary",`
		`+ "ostree_oskey=fedora-35-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/ppc64le/silverblue",`
		`"ostree_update_ref=fedora/rawhide/ppc64le/silverblue",`
		`@@ -863,7 +863,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-34-primary",`
		`+ "ostree_oskey=fedora-35-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/aarch64/silverblue",`
		`"ostree_update_ref=fedora/rawhide/aarch64/silverblue",`

nightly.sh

file modified

+1 -1

		`@@ -213,7 +213,7 @@`
		`# Push rawhide base container image to fedora registry`
		`pushd ./releng`
		`pushd ./scripts`
		`- ./sync-latest-container-base-image.sh 34`
		`+ ./sync-latest-container-base-image.sh 35`
		`popd`
		`popd`

variants-fedora.xml

file modified

+1 -1

		`@@ -95,7 +95,7 @@`
		`<arch>x86_64</arch>`
		`</arches>`
		`<modules>`
		`- <kojitag>f34-modular</kojitag>`
		`+ <kojitag>f35-modular</kojitag>`
		`</modules>`
		`</variant>`
		`</variants>`