From d23774204c6b7740a664a047eb48c95b26e4a6ef Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Aug 12 2025 13:28:34 +0000 Subject: F-44: Update for branching Signed-off-by: Paul Whalen --- diff --git a/fedora-iot.conf b/fedora-iot.conf index dc73fbe..9cda9d0 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 = '43' +release_version = '44' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f43 runs. +# and OSTree installer we'll use inputs from other f44 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-f43.xml', - 'command': 'make comps-f43.xml' + 'file': 'comps-f44.xml', + 'command': 'make comps-f44.xml' } variants_file='variants-fedora.xml' -sigkeys = ['31645531'] +sigkeys = ['6D9F90A6'] # 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 = 'f43-build' +runroot_tag = 'f44-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f43-iot' +pkgset_koji_tag = 'f44-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -205,11 +205,11 @@ 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 = '43' +global_version = '44' # live_images ignores this in favor of live_target -global_target = 'f43' +global_target = 'f44' -imagebuilder_target = 'f43-image-builder' +imagebuilder_target = 'f44-image-builder' imagebuilder = { "^IoT$": [ { diff --git a/nightly.sh b/nightly.sh index 343e11e..53d8229 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="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.xml" +RELEASE="44" +RELEASE_TITLE="44" +COMPSFILE="comps-f44.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 0999c92..953d1fb 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="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.xml" +RELEASE="44" +RELEASE_TITLE="44" +COMPSFILE="comps-f44.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/43/" +RSYNCTARGET="/pub/alt/iot/44/" 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 560183d..0cc7718 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="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.xml" +RELEASE="44" +RELEASE_TITLE="44" +COMPSFILE="comps-f44.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report "