From bff3d8261db7ad59f3f24c9719ce96fa427d8353 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Aug 12 2024 18:11:08 +0000 Subject: Rawhide is now Fedora 42 Signed-off-by: Paul Whalen --- diff --git a/fedora-iot.conf b/fedora-iot.conf index 99c08de..cfa2b1f 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,9 +1,9 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '41' +release_version = '42' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f41 runs. +# and OSTree installer we'll use inputs from other f42 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] # GENERAL SETTINGS @@ -11,11 +11,11 @@ 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'] +sigkeys = ['105ef944'] # limit tree architectures # if undefined, all architectures from variants.xml will be included @@ -27,7 +27,7 @@ hashed_directories = True # RUNROOT settings runroot_channel = 'compose' -runroot_tag = 'f41-build' +runroot_tag = 'f42-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f41-iot' +pkgset_koji_tag = 'f42-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -205,15 +205,15 @@ translate_paths = [ # These will be inherited by live_media, live_images and image_build global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '41' +global_version = '42' # live_images ignores this in favor of live_target -global_target = 'f41' +global_target = 'f42' osbuild = { "^IoT$": [ { "name": "%s-raw" % release_name, - "distro": "fedora-41", + "distro": "fedora-42", "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -224,7 +224,7 @@ osbuild = { }, { "name": "%s-ostree" % release_name, - "distro": "fedora-41", + "distro": "fedora-42", "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -236,7 +236,7 @@ osbuild = { }, { "name": "%s-provisioner" % release_name, - "distro": "fedora-41", + "distro": "fedora-42", "image_types": ["iot-simplified-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], diff --git a/nightly.sh b/nightly.sh index e42e037..a6675b7 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -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="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " diff --git a/sync-release.sh b/sync-release.sh index b2b7276..1ad1bfe 100755 --- a/sync-release.sh +++ b/sync-release.sh @@ -12,14 +12,14 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -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="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/41/" +RSYNCTARGET="/pub/alt/iot/42/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 990268a..7d8d312 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -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="iot@lists.fedoraproject.org" FROM="Fedora IoT Report "