diff --git a/fedora-iot.conf b/fedora-iot.conf index 9dd2805..1db80ff 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 = '37' +release_version = '38' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f37 runs. +# and OSTree installer we'll use inputs from other f38 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-f37.xml', - 'command': 'make comps-f37.xml' + 'file': 'comps-f38.xml', + 'command': 'make comps-f38.xml' } variants_file='variants-fedora.xml' -sigkeys = ['5323552A'] +sigkeys = ['eb10b464'] # 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 = 'f37-build' +runroot_tag = 'f38-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -38,7 +38,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f37-iot' +pkgset_koji_tag = 'f38-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -202,9 +202,9 @@ 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 = '37' +global_version = '38' # live_images ignores this in favor of live_target -global_target = 'f37' +global_target = 'f38' image_build = { '^IoT$': [ @@ -273,7 +273,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-37-primary", + "ostree_oskey=fedora-38-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/rawhide/aarch64/iot", "ostree_update_ref=fedora/rawhide/aarch64/iot", @@ -294,7 +294,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-37-primary", + "ostree_oskey=fedora-38-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 d4f2617..b155fd7 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="30" -RELEASE_TITLE="30" -COMPSFILE="comps-f30.xml" +RELEASE="38" +RELEASE_TITLE="38" +COMPSFILE="comps-f38.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 91069ab..6fd5ea1 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="36" -RELEASE_TITLE="36" -COMPSFILE="comps-f36.xml" +RELEASE="38" +RELEASE_TITLE="38" +COMPSFILE="comps-f38.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/36/" +RSYNCTARGET="/pub/alt/iot/38/" 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 059993c..609b185 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="37" -RELEASE_TITLE="37" -COMPSFILE="comps-f37.xml" +RELEASE="38" +RELEASE_TITLE="38" +COMPSFILE="comps-f38.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report "