From fee826a6ea4f2c978a752bc58ec49a328d4e585a Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Feb 10 2023 16:35:40 +0000 Subject: f39: update for branching Signed-off-by: Paul Whalen --- diff --git a/fedora-iot.conf b/fedora-iot.conf index 988efbe..6c88f25 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 = '38' +release_version = '39' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f38 runs. +# and OSTree installer we'll use inputs from other f39 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] ostree_installer_overwrite = True @@ -12,11 +12,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f38.xml', - 'command': 'make comps-f38.xml' + 'file': 'comps-f39.xml', + 'command': 'make comps-f39.xml' } variants_file='variants-fedora.xml' -sigkeys = ['eb10b464'] +sigkeys = ['18B8e74c'] # limit tree architectures # if undefined, all architectures from variants.xml will be included @@ -28,7 +28,7 @@ hashed_directories = True # RUNROOT settings runroot_channel = 'compose' -runroot_tag = 'f38-build' +runroot_tag = 'f39-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -38,7 +38,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f38-iot' +pkgset_koji_tag = 'f39-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -206,16 +206,16 @@ 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 = '38' +global_version = '39' # live_images ignores this in favor of live_target -global_target = 'f38' +global_target = 'f39' osbuild = { "^IoT$": [ { "name": "%s" % release_name, "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "distro": "fedora-38", + "distro": "fedora-39", "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -227,7 +227,7 @@ osbuild = { { "name": "%s-ostree" % release_name, "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "distro": "fedora-38", + "distro": "fedora-39", "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -289,7 +289,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_update_repo=https://ostree.fedoraproject.org/iot/", "ostree_osname=fedora-iot", - "ostree_oskey=fedora-38-primary", + "ostree_oskey=fedora-39-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/rawhide/aarch64/iot", "ostree_update_ref=fedora/rawhide/aarch64/iot", @@ -310,7 +310,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_update_repo=https://ostree.fedoraproject.org/iot/", "ostree_osname=fedora-iot", - "ostree_oskey=fedora-38-primary", + "ostree_oskey=fedora-39-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/rawhide/x86_64/iot", "ostree_update_ref=fedora/rawhide/x86_64/iot", diff --git a/nightly.sh b/nightly.sh index b155fd7..d73de5e 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="38" -RELEASE_TITLE="38" -COMPSFILE="comps-f38.xml" +RELEASE="39" +RELEASE_TITLE="39" +COMPSFILE="comps-f39.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 6fd5ea1..06743d6 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="38" -RELEASE_TITLE="38" -COMPSFILE="comps-f38.xml" +RELEASE="39" +RELEASE_TITLE="39" +COMPSFILE="comps-f39.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/38/" +RSYNCTARGET="/pub/alt/iot/39/" 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 609b185..6a10825 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="38" -RELEASE_TITLE="38" -COMPSFILE="comps-f38.xml" +RELEASE="39" +RELEASE_TITLE="39" +COMPSFILE="comps-f39.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report "