Set correct productmd image type for osbuild installer image

In the productmd metadata, these osbuild-built installer images
have their 'type' as "dvd". This is not correct: the "dvd" type
is meant to be a traditional RPM-based installer image, like the
old Everything DVD or the current Server DVD. The correct "type"
for an ostree installer image is "dvd-ostree" or
"dvd-ostree-osbuild".

This 'manifest_type' thing was added after the discussion in
https://pagure.io/pungi-fedora/pull-request/1190 , to let us
specify the productmd type for osbuild-built images correctly.
In this case we want to use "dvd-ostree-osbuild" because for
F39 the osbuild image is "experimental" and there still exists
an image built the older way which has the "dvd-ostree" type,
so we don't want to collide with it.

The practical consequence of this at present is the osbuild
images aren't getting openQA testing, because openQA relies
on this property to identify the image, and it's not expecting
to see "dvd". As of right now it also would not test an image
with "dvd-ostree-osbuild" type, but I can easily update it to
test those images the same way it tests "dvd-ostree" images.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

fedora-iot.conf

@@ -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
@@ -214,27 +214,28 @@ osbuild = {
     "^IoT$": [
       {
         "name": "%s" % release_name,
-        "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
         "distro": "fedora-39",
         "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/39/Fedora-39-20231031.1/compose/Everything/$arch/os/",
+                 "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/"],
         "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
-        "ostree_ref": "fedora/rawhide/$arch/iot",
+        "ostree_ref": "fedora/stable/$arch/iot",
         "subvariant": "IoT",
       },
       {
         "name": "%s-ostree" % release_name,
-        "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
         "distro": "fedora-39",
         "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/39/Fedora-39-20231031.1/compose/Everything/$arch/os/",
+                 "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/"],
         "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
-        "ostree_ref": "fedora/rawhide/$arch/iot",
+        "ostree_ref": "fedora/stable/$arch/iot",
         "subvariant": "IoT",
+        "manifest_type": "dvd-ostree-osbuild",
       },
  ],
 }
@@ -246,14 +247,15 @@ 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/39/Fedora-39-20231031.1/compose/Everything/$basearch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$basearch/os/"
             ]
             "tag_ref": False,
             "ostree_repo": "/mnt/koji/compose/iot/repo/",
-            "ostree_ref": "fedora/rawhide/${basearch}/iot",
+            "ostree_ref": "fedora/stable/${basearch}/iot",
             "update_summary": True,
         },
         "x86_64": {
@@ -261,14 +263,15 @@ 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/39/Fedora-39-20231031.1/compose/Everything/$basearch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$basearch/os/"
             ]
             "tag_ref": False,
             "ostree_repo": "/mnt/koji/compose/iot/repo/",
-            "ostree_ref": "fedora/rawhide/${basearch}/iot",
+            "ostree_ref": "fedora/stable/${basearch}/iot",
             "update_summary": True,
         }
     })
@@ -279,7 +282,8 @@ ostree_installer = [
         "aarch64": {
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/"
             ],
             "release": None,
             "rootfs_size": "4",
@@ -291,16 +295,17 @@ 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/stable/aarch64/iot",
+                "ostree_update_ref=fedora/stable/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/39/Fedora-39-20231031.1/compose/Everything/$arch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/"
             ],
             "release": None,
             "rootfs_size": "4",
@@ -312,11 +317,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/stable/x86_64/iot",
+                "ostree_update_ref=fedora/stable/x86_64/iot",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f39',
         }
     })
 ]

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
@@ -49,6 +49,9 @@ if [ "$?" != "0" ]; then
 fi
 ostree summary --update --repo=/mnt/koji/compose/iot/repo/
 
+# Exit now we're post release
+exit 1
+
 NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')