PR#1311: Rawhide is now F42 - pungi-fedora

pungi-fedora

#1311 Rawhide is now F42

Merged 2 months ago by jnsamyak. Opened 2 months ago by jnsamyak.

jnsamyak/pungi-fedora main into main

Update sig_keys to be f42

Samyak Jain • 2 months ago

2e08dad

Rawhide is now F42

Samyak Jain • 2 months ago

83ccde7

cloud-nightly.sh

file modified

+3 -3

		`@@ -15,9 +15,9 @@`
		`DATE=$(date "+%Y%m%d")`
		`# the Pungi 'shortname', which we will include in fedmsgs for disambiguation`
		`SHORT="Fedora-Cloud"`
		`- RELEASE="41"`
		`- RELEASE_TITLE="41"`
		`- COMPSFILE="comps-f41.xml"`
		`+ RELEASE="42"`
		`+ RELEASE_TITLE="42"`
		`+ COMPSFILE="comps-f42.xml"`
		TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
		`TOMAIL="test-reports@lists.fedoraproject.org"`
		`FROM="Fedora Branched Report <rawhide@fedoraproject.org>"`

container-nightly.sh

file modified

+3 -3

		`@@ -14,9 +14,9 @@`
		`DATE=$(date "+%Y%m%d")`
		`# the Pungi 'shortname', which we will include in fedmsgs for disambiguation`
		`SHORT="Fedora-Docker"`
		`- RELEASE="41"`
		`- RELEASE_TITLE="41"`
		`- COMPSFILE="comps-f41.xml"`
		`+ RELEASE="42"`
		`+ RELEASE_TITLE="42"`
		`+ COMPSFILE="comps-f42.xml"`
		TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
		`TOMAIL="test-reports@lists.fedoraproject.org"`
		`FROM="Fedora Branched Report <rawhide@fedoraproject.org>"`

fedora-cloud.conf

file modified

+22 -22

		`@@ -6,24 +6,24 @@`
		`# PRODUCT INFO`
		`release_name = 'Fedora-Cloud'`
		`release_short = 'Fedora-Cloud'`
		`- release_version = '41'`
		`+ release_version = '42'`
		`skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]`
		`# GENERAL SETTINGS`
		`comps_file = {`
		`'scm': 'git',`
		`'repo': 'https://pagure.io/fedora-comps.git',`
		`'branch': 'main',`
		`- 'file': 'comps-f41.xml',`
		`- 'command': 'make comps-f41.xml'`
		`+ 'file': 'comps-f42.xml',`
		`+ 'command': 'make comps-f42.xml'`
		`}`
		`variants_file='variants-fedora.xml'`
		`- sigkeys = ['e99d6ad1'] # None = unsigned`
		`+ sigkeys = ['105ef944'] # None = unsigned`

		`# limit tree variants`
		`# if undefined, all variants from variants.xml will be included`
		`tree_variants = ['Cloud']`
		`# PKGSET`
		`- pkgset_koji_tag = 'f41-updates'`
		`+ pkgset_koji_tag = 'f42-updates'`
		`pkgset_koji_inherit = True`
		`# GATHER`
		`gather_method = 'deps'`
		`@@ -138,11 +138,11 @@`

		`# These will be inherited by live_media, live_images, image_build, and kiwibuild`
		`global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'`
		`- global_version = '41'`
		`- global_target = 'f41'`
		`+ global_version = '42'`
		`+ global_target = 'f42'`

		`# kiwi images need another target that uses old mock chroot`
		`- kiwibuild_target = 'f41-kiwi'`
		`+ kiwibuild_target = 'f42-kiwi'`

		`kiwibuild = {`
		`'^Cloud$': [`
		`@@ -152,8 +152,8 @@`
		`'kiwi_profile': 'Cloud-Base-Generic',`
		`'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Cloud_Base',`
		`'failable': ['ppc64le', 's390x'],`
		`@@ -164,8 +164,8 @@`
		`'kiwi_profile': 'Cloud-Base-AmazonEC2',`
		`'arches': ['aarch64', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Cloud_Base',`
		`'failable': ['*'],`
		`@@ -176,8 +176,8 @@`
		`'kiwi_profile': 'Cloud-Base-Azure',`
		`'arches': ['aarch64', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Cloud_Base',`
		`'failable': ['*'],`
		`@@ -188,8 +188,8 @@`
		`'kiwi_profile': 'Cloud-Base-GCE',`
		`'arches': ['aarch64', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Cloud_Base',`
		`'failable': ['*'],`
		`@@ -200,8 +200,8 @@`
		`'kiwi_profile': 'Cloud-Base-UEFI-UKI',`
		`'arches': ['aarch64', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Cloud_Base_UKI',`
		`'failable': ['*'],`
		`@@ -212,8 +212,8 @@`
		`'kiwi_profile': 'Cloud-Base-Vagrant-libvirt',`
		`'arches': ['aarch64', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Cloud_Base',`
		`'failable': ['*'],`
		`@@ -224,8 +224,8 @@`
		`'kiwi_profile': 'Cloud-Base-Vagrant-VirtualBox',`
		`'arches': ['x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Cloud_Base',`
		`'failable': ['*'],`

fedora-container.conf

file modified

+13 -13

		`@@ -6,22 +6,22 @@`
		`# PRODUCT INFO`
		`release_name = 'Fedora-Container'`
		`release_short = 'Fedora-Container'`
		`- release_version = '41'`
		`+ release_version = '42'`
		`skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]`
		`# GENERAL SETTINGS`
		`comps_file = {`
		`'scm': 'git',`
		`'repo': 'https://pagure.io/fedora-comps.git',`
		`'branch': 'main',`
		`- 'file': 'comps-f41.xml',`
		`- 'command': 'make comps-f41.xml'`
		`+ 'file': 'comps-f42.xml',`
		`+ 'command': 'make comps-f42.xml'`
		`}`
		`- sigkeys = ['e99d6ad1'] # None = unsigned`
		`+ sigkeys = ['105ef944'] # None = unsigned`
		`# limit tree variants`
		`# if undefined, all variants from variants.xml will be included`
		`tree_variants = ['Container']`
		`# PKGSET`
		`- pkgset_koji_tag = 'f41-updates'`
		`+ pkgset_koji_tag = 'f42-updates'`
		`pkgset_koji_inherit = True`
		`# GATHER`
		`gather_method = 'deps'`
		`@@ -136,8 +136,8 @@`

		`# These will be inherited by live_media, live_images, image_build, and kiwibuild`
		`global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'`
		`- global_version = '41'`
		`- global_target = 'f41'`
		`+ global_version = '42'`
		`+ global_target = 'f42'`

		`kiwibuild = {`
		`'^Container$': [`
		`@@ -147,8 +147,8 @@`
		`'kiwi_profile': 'Container-Base-Generic',`
		`'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Container_Base',`
		`},`
		`@@ -158,8 +158,8 @@`
		`'kiwi_profile': 'Container-Base-Generic-Minimal',`
		`'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Container_Minimal_Base',`
		`},`
		`@@ -169,8 +169,8 @@`
		`'kiwi_profile': 'Container-Toolbox',`
		`'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'`
		`+ 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`+ 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`],`
		`'subvariant': 'Container_Toolbox',`
		`}`

fedora.conf

file modified

+16 -16

		`@@ -18,7 +18,7 @@`
		`}`

		`variants_file='variants-fedora.xml'`
		`- sigkeys = ['e99d6ad1']`
		`+ sigkeys = ['105ef944']`

		`# limit tree variants`
		`# if undefined, all variants from variants.xml will be included`
		`@@ -35,7 +35,7 @@`
		`# pkgset_repos = {}`

		`# PKGSET - KOJI`
		`- pkgset_koji_tag = 'f41'`
		`+ pkgset_koji_tag = 'f42'`
		`pkgset_koji_inherit = False`

		`# GATHER`
		`@@ -201,9 +201,9 @@`
		`global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'`
		`global_version = 'Rawhide'`
		`# live_images ignores this in favor of live_target`
		`- global_target = 'f41'`
		`+ global_target = 'f42'`
		`# kiwi images need another target that uses old mock chroot`
		`- kiwibuild_target = 'f41-kiwi'`
		`+ kiwibuild_target = 'f42-kiwi'`


		`image_build = {`
		`@@ -214,7 +214,7 @@`
		`'name': 'Fedora-Python-Classroom-Vagrant',`
		`'kickstart': 'fedora-python-classroom-vagrant.ks',`
		`'distro': 'Fedora-22',`
		`- 'disk_size': 41,`
		`+ 'disk_size': 42,`
		`'arches': ['x86_64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`@@ -231,7 +231,7 @@`
		`'name': 'Fedora-Scientific-Vagrant',`
		`'kickstart': 'fedora-scientific-vagrant.ks',`
		`'distro': 'Fedora-22',`
		`- 'disk_size': 41,`
		`+ 'disk_size': 42,`
		`'arches': ['x86_64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`@@ -776,7 +776,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-41-primary",`
		`+ "ostree_oskey=fedora-42-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",`
		`@@ -804,7 +804,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-41-primary",`
		`+ "ostree_oskey=fedora-42-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/ppc64le/silverblue",`
		`"ostree_update_ref=fedora/rawhide/ppc64le/silverblue",`
		`@@ -832,7 +832,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-41-primary",`
		`+ "ostree_oskey=fedora-42-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/aarch64/silverblue",`
		`"ostree_update_ref=fedora/rawhide/aarch64/silverblue",`
		`@@ -862,7 +862,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-41-primary",`
		`+ "ostree_oskey=fedora-42-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",`
		`@@ -890,7 +890,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-41-primary",`
		`+ "ostree_oskey=fedora-42-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/ppc64le/kinoite",`
		`"ostree_update_ref=fedora/rawhide/ppc64le/kinoite",`
		`@@ -918,7 +918,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-41-primary",`
		`+ "ostree_oskey=fedora-42-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/aarch64/kinoite",`
		`"ostree_update_ref=fedora/rawhide/aarch64/kinoite",`
		`@@ -947,7 +947,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-41-primary",`
		`+ "ostree_oskey=fedora-42-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/x86_64/sericea",`
		`"ostree_update_ref=fedora/rawhide/x86_64/sericea",`
		`@@ -975,7 +975,7 @@`
		`"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`"ostree_update_repo=https://ostree.fedoraproject.org",`
		`"ostree_osname=fedora",`
		`- "ostree_oskey=fedora-41-primary",`
		`+ "ostree_oskey=fedora-42-primary",`
		`"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`"ostree_install_ref=fedora/rawhide/x86_64/onyx",`
		`"ostree_update_ref=fedora/rawhide/x86_64/onyx",`
		`@@ -998,7 +998,7 @@`
		`'^Workstation$': [`
		`{`
		`'name': 'Fedora-Workstation-Live-osb',`
		`- 'distro': 'fedora-41',`
		`+ 'distro': 'fedora-42',`
		`'image_types': ['live-installer'],`
		`'arches': ['x86_64', 'aarch64'],`
		`'repo': ['Everything'],`
		`@@ -1009,7 +1009,7 @@`
		`'^Spins$': [`
		`{`
		`'name': 'Fedora-Minimal',`
		`- 'distro': 'fedora-41',`
		`+ 'distro': 'fedora-42',`
		`'image_types': ['minimal-raw'],`
		`'arches': ['aarch64'],`
		`'repo': ['Everything'],`

general.conf

file modified

+1 -1

		`@@ -9,7 +9,7 @@`

		`# RUNROOT settings`
		`runroot_channel = 'compose'`
		`- runroot_tag = 'f41-build'`
		`+ runroot_tag = 'f42-build'`

		`# PKGSET`
		`pkgset_source = 'koji' # koji, repos`

nightly.sh

file modified

+2 -2

		`@@ -219,8 +219,8 @@`
		`# Push rawhide ostree base container image to fedora registry`
		`pushd ./releng`
		`pushd ./scripts`
		`- ./sync-latest-container-base-image.sh 41`
		`- ./sync-ostree-base-containers.sh 41`
		`+ ./sync-latest-container-base-image.sh 42`
		`+ ./sync-ostree-base-containers.sh 42`
		`popd`
		`popd`

jnsamyak commented 2 months ago

Two things:

Please do not merge this before August 13; It is open for review.
Need to confirm what F42 sigkeys is; couldn't find it in the ansible, and still the sigul admin password seems not to work for me

Signed-off-by: Samyak Jain samyak.jn11@gmail.com

jnsamyak commented 2 months ago

From my understanding of gpg and it's public keys, this should be

105EF944 SHORT version of fedora-42 key 105ef944 Please confirm this as part of your review.

1 new commit added

Update sig_keys to be f42

2 months ago

kevin commented 2 months ago

2 minor things:

disk_size': 42 changes look wrong? Thats just a size, not a 40/42? also that looks... really large. Did we perhaps mess up and change this to 41 last time and before it was something more reasonable in the past?
We should ping the osbbuild folks and ask them to make sure they are ready for 42 builds? I am not sure if they have to do anything on their side.
They hang our (sometimes?) in the #image-builder:fedoraproject.org room

The key is correct. :) You can get it from sigul with a 'sigul get-public-key fedora-42', import it into your local gpg keyring and you can see the hash there.

jnsamyak commented 2 months ago

yeah fixed the disk_size to 40 as it was earlier before;

I will ping the osbuild folks now

rebased onto 8acdab3

2 months ago

Pull-Request has been merged by jnsamyak

2 months ago