From ded903ff381963dea90653c63da6771251ee2ca8 Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Aug 14 2023 17:26:22 +0000
Subject: F40: Update for branching


Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

---

diff --git a/fedora-iot.conf b/fedora-iot.conf
index 5e58483..719c309 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 = '39'
+release_version = '40'
 # Let's not build install media during this run. For the image builds
-# and OSTree installer we'll use inputs from other f39 runs.
+# and OSTree installer we'll use inputs from other f40 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-f39.xml',
-    'command': 'make comps-f39.xml'
+    'file': 'comps-f40.xml',
+    'command': 'make comps-f40.xml'
 }
 variants_file='variants-fedora.xml'
-sigkeys = ['18B8e74c']
+sigkeys = ['a15B79cc']
 
 # 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 = 'f39-build'
+runroot_tag = 'f40-build'
 
 # PKGSET
 pkgset_source = 'koji' # koji, repos
@@ -38,7 +38,7 @@ pkgset_source = 'koji' # koji, repos
 # pkgset_repos = {}
 
 # PKGSET - KOJI
-pkgset_koji_tag = 'f39-iot'
+pkgset_koji_tag = 'f40-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 = '39'
+global_version = '40'
 # live_images ignores this in favor of live_target
-global_target = 'f39'
+global_target = 'f40'
 
 osbuild = {
     "^IoT$": [
       {
         "name": "%s" % release_name,
         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
-        "distro": "fedora-39",
+        "distro": "fedora-40",
         "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-39",
+        "distro": "fedora-40",
         "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-39-primary",
+                "ostree_oskey=fedora-40-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-39-primary",
+                "ostree_oskey=fedora-40-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 d73de5e..cf44a8f 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="39"
-RELEASE_TITLE="39"
-COMPSFILE="comps-f39.xml"
+RELEASE="40"
+RELEASE_TITLE="40"
+COMPSFILE="comps-f40.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="iot@lists.fedoraproject.org"
 FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
diff --git a/sync-release.sh b/sync-release.sh
index 06743d6..a14c16d 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="39"
-RELEASE_TITLE="39"
-COMPSFILE="comps-f39.xml"
+RELEASE="40"
+RELEASE_TITLE="40"
+COMPSFILE="comps-f40.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="iot@lists.fedoraproject.org"
 FROM="Fedora IoT Report <branched@fedoraproject.org>"
 RSYNCPREFIX="sudo -u ftpsync"
-RSYNCTARGET="/pub/alt/iot/39/"
+RSYNCTARGET="/pub/alt/iot/40/"
 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 6a10825..717a35f 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="39"
-RELEASE_TITLE="39"
-COMPSFILE="comps-f39.xml"
+RELEASE="40"
+RELEASE_TITLE="40"
+COMPSFILE="comps-f40.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="iot@lists.fedoraproject.org"
 FROM="Fedora IoT Report <rawhide@fedoraproject.org>"