PR#1038: rawhide is f36 - pungi-fedora

pungi-fedora

#1038 rawhide is f36

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

humaton/pungi-fedora f36_new_rawhide into main

rawhide is f36

Tomas Hrcka • 2 years ago

f72c118

fedora.conf

file modified

+13 -13

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

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

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

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

		`image_build = {`
		`'^Container$': [`
		`@@ -330,8 +330,8 @@`
		`'factory-parameters': {`
		`'dockerversion': "1.10.1",`
		`'docker_cmd': '[ "/bin/bash" ]',`
		`- 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',`
		`- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',`
		`+ 'docker_env': '[ "DISTTAG=f36container", "FGC=f36", "container=oci" ]',`
		`+ 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "36"}',`
		`},`
		`},`
		`{`
		`@@ -350,8 +350,8 @@`
		`'factory-parameters': {`
		`'dockerversion': "1.10.1",`
		`'docker_cmd': '[ "/bin/bash" ]',`
		`- 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',`
		`- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "34"}',`
		`+ 'docker_env': '[ "DISTTAG=f36container", "FGC=f36", "container=oci" ]',`
		`+ 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "36"}',`
		`},`
		`}`
		`],`
		`@@ -772,7 +772,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-35-primary",`
		`+ "ostree_oskey=fedora-36-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",`
		`@@ -798,7 +798,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-35-primary",`
		`+ "ostree_oskey=fedora-36-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/ppc64le/silverblue",`
		`"ostree_update_ref=fedora/rawhide/ppc64le/silverblue",`
		`@@ -824,7 +824,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-35-primary",`
		`+ "ostree_oskey=fedora-36-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/aarch64/silverblue",`
		`"ostree_update_ref=fedora/rawhide/aarch64/silverblue",`
		`@@ -853,7 +853,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-35-primary",`
		`+ "ostree_oskey=fedora-36-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/x86_64/kinoite",`
		`"ostree_update_ref=fedora/rawhide/x86_64/kinoite",`
		`@@ -879,7 +879,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-35-primary",`
		`+ "ostree_oskey=fedora-36-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/ppc64le/kinoite",`
		`"ostree_update_ref=fedora/rawhide/ppc64le/kinoite",`
		`@@ -905,7 +905,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-35-primary",`
		`+ "ostree_oskey=fedora-36-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/aarch64/kinoite",`
		`"ostree_update_ref=fedora/rawhide/aarch64/kinoite",`

nightly.sh

file modified

+1 -1

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

variants-fedora.xml

file modified

+1 -1

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