From 6d2199c6c5351a41d3056679f13c7c03131fb44c Mon Sep 17 00:00:00 2001
From: Paul Whalen <pwhalen@fedoraproject.org>
Date: Aug 14 2023 17:43:08 +0000
Subject: F39: Update for branching


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

---

diff --git a/fedora-iot.conf b/fedora-iot.conf
index 5e58483..4ed6304 100644
--- a/fedora-iot.conf
+++ b/fedora-iot.conf
@@ -11,7 +11,7 @@ ostree_installer_overwrite = True
 comps_file = {
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
-    'branch': 'main',
+    'branch': 'f39',
     'file': 'comps-f39.xml',
     'command': 'make comps-f39.xml'
 }
@@ -204,7 +204,7 @@ 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_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f39'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
 global_version = '39'
 # live_images ignores this in favor of live_target
@@ -219,9 +219,9 @@ osbuild = {
         "image_types": ["iot-raw-image"],
         "target": "f%s-candidate" % release_version,
         "arches": ["x86_64", "aarch64"],
-        "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
+        "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$arch/os/"],
         "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
-        "ostree_ref": "fedora/rawhide/$arch/iot",
+        "ostree_ref": "fedora/devel/$arch/iot",
         "subvariant": "IoT",
       },
       {
@@ -231,9 +231,9 @@ osbuild = {
         "image_types": ["iot-installer"],
         "target": "f%s-candidate" % release_version,
         "arches": ["x86_64", "aarch64"],
-        "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
+        "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$arch/os/"],
         "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
-        "ostree_ref": "fedora/rawhide/$arch/iot",
+        "ostree_ref": "fedora/devel/$arch/iot",
         "subvariant": "IoT",
       },
  ],
@@ -246,14 +246,14 @@ ostree = [
             "force_new_commit": True,
             "treefile": "fedora-iot.json",
             "config_url": "https://pagure.io/fedora-iot/ostree.git",
-            "config_branch": "main",
+            "config_branch": "f39",
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$basearch/os/"
             ]
             "tag_ref": False,
             "ostree_repo": "/mnt/koji/compose/iot/repo/",
-            "ostree_ref": "fedora/rawhide/${basearch}/iot",
+            "ostree_ref": "fedora/devel/${basearch}/iot",
             "update_summary": True,
         },
         "x86_64": {
@@ -261,14 +261,14 @@ ostree = [
             "force_new_commit": True,
             "treefile": "fedora-iot.json",
             "config_url": "https://pagure.io/fedora-iot/ostree.git",
-            "config_branch": "main",
+            "config_branch": "f39",
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$basearch/os/"
             ]
             "tag_ref": False,
             "ostree_repo": "/mnt/koji/compose/iot/repo/",
-            "ostree_ref": "fedora/rawhide/${basearch}/iot",
+            "ostree_ref": "fedora/devel/${basearch}/iot",
             "update_summary": True,
         }
     })
@@ -279,7 +279,7 @@ ostree_installer = [
         "aarch64": {
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$arch/os/"
             ],
             "release": None,
             "rootfs_size": "4",
@@ -291,16 +291,16 @@ ostree_installer = [
                 "ostree_osname=fedora-iot",
                 "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",
+                "ostree_install_ref=fedora/devel/aarch64/iot",
+                "ostree_update_ref=fedora/devel/aarch64/iot",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f39',
         },
         "x86_64": {
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$arch/os/"
             ],
             "release": None,
             "rootfs_size": "4",
@@ -312,11 +312,11 @@ ostree_installer = [
                 "ostree_osname=fedora-iot",
                 "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",
+                "ostree_install_ref=fedora/devel/x86_64/iot",
+                "ostree_update_ref=fedora/devel/x86_64/iot",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f39',
         }
     })
 ]
diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh
index 6a10825..7ad52f2 100755
--- a/twoweek-nightly.sh
+++ b/twoweek-nightly.sh
@@ -18,7 +18,7 @@ TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="iot@lists.fedoraproject.org"
 FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
 RSYNCPREFIX="sudo -u ftpsync"
-RSYNCTARGET="/pub/alt/iot/rawhide/"
+RSYNCTARGET="/pub/alt/iot/branched/"
 OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 
 # assume a releng dir is a git checkout of the releng repo

