From 83ccde7e0ed06d5a4c368dde4bc4f7e97ee05a8c Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Aug 13 2024 13:31:34 +0000 Subject: Rawhide is now F42 Signed-off-by: Samyak Jain --- diff --git a/cloud-nightly.sh b/cloud-nightly.sh index 0970ab9..d5798a0 100755 --- a/cloud-nightly.sh +++ b/cloud-nightly.sh @@ -15,9 +15,9 @@ DEST=$(pwd) 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 " diff --git a/container-nightly.sh b/container-nightly.sh index c5bc42e..728891b 100755 --- a/container-nightly.sh +++ b/container-nightly.sh @@ -14,9 +14,9 @@ DEST=$(pwd) 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 " diff --git a/fedora-cloud.conf b/fedora-cloud.conf index 2755a17..9f7c0e8 100644 --- a/fedora-cloud.conf +++ b/fedora-cloud.conf @@ -6,15 +6,15 @@ from multilib import * # 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 @@ -23,7 +23,7 @@ sigkeys = ['e99d6ad1'] # None = unsigned # 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 @@ image_volid_formats = [ # 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 @@ kiwibuild = { '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 @@ kiwibuild = { '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 @@ kiwibuild = { '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 @@ kiwibuild = { '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 @@ kiwibuild = { '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 @@ kiwibuild = { '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 @@ kiwibuild = { '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': ['*'], diff --git a/fedora-container.conf b/fedora-container.conf index c517085..6a1685d 100644 --- a/fedora-container.conf +++ b/fedora-container.conf @@ -6,22 +6,22 @@ from multilib import * # 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 # 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 @@ image_volid_formats = [ # 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 @@ kiwibuild = { '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 @@ kiwibuild = { '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 @@ kiwibuild = { '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', } diff --git a/fedora.conf b/fedora.conf index b2f258f..7840360 100644 --- a/fedora.conf +++ b/fedora.conf @@ -35,7 +35,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f41' +pkgset_koji_tag = 'f42' pkgset_koji_inherit = False # GATHER @@ -201,9 +201,9 @@ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD' 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 @@ image_build = { '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 @@ image_build = { '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_installer = [ "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_installer = [ "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_installer = [ "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_installer = [ "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_installer = [ "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_installer = [ "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_installer = [ "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_installer = [ "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 @@ osbuild = { '^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 @@ osbuild = { '^Spins$': [ { 'name': 'Fedora-Minimal', - 'distro': 'fedora-41', + 'distro': 'fedora-42', 'image_types': ['minimal-raw'], 'arches': ['aarch64'], 'repo': ['Everything'], diff --git a/general.conf b/general.conf index 95e888d..8d8b21e 100644 --- a/general.conf +++ b/general.conf @@ -9,7 +9,7 @@ hashed_directories = True # RUNROOT settings runroot_channel = 'compose' -runroot_tag = 'f41-build' +runroot_tag = 'f42-build' # PKGSET pkgset_source = 'koji' # koji, repos diff --git a/nightly.sh b/nightly.sh index 1d733ea..8895951 100755 --- a/nightly.sh +++ b/nightly.sh @@ -219,8 +219,8 @@ umask $old_umask # 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