F-35 IoT: enable updates repo

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>

fedora-iot.conf

@@ -200,7 +200,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/f35'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
 global_version = '35'
 # live_images ignores this in favor of live_target
@@ -216,7 +216,7 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 4,
                     'arches': ['armhfp', 'aarch64', 'x86_64'],
-                    'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/",
+                    'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/35/Fedora-35-20211026.0/compose/Everything/$arch/os/",
                     'subvariant': 'IoT',
                      }
         }
@@ -230,14 +230,15 @@ ostree = [
             "force_new_commit": True,
             "treefile": "fedora-iot.json",
             "config_url": "https://pagure.io/fedora-iot/ostree.git",
-            "config_branch": "main",
+            "config_branch": "f35",
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/35/Fedora-35-20211026.0/compose/Everything/$basearch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f35-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,
         },
         "armhfp": {
@@ -245,14 +246,15 @@ ostree = [
             "force_new_commit": True,
             "treefile": "fedora-iot.json",
             "config_url": "https://pagure.io/fedora-iot/ostree.git",
-            "config_branch": "main",
+            "config_branch": "f35",
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/35/Fedora-35-20211026.0/compose/Everything/$basearch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f35-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": {
@@ -260,14 +262,15 @@ ostree = [
             "force_new_commit": True,
             "treefile": "fedora-iot.json",
             "config_url": "https://pagure.io/fedora-iot/ostree.git",
-            "config_branch": "main",
+            "config_branch": "f35",
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/35/Fedora-35-20211026.0/compose/Everything/$basearch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f35-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,
         }
     })
@@ -278,7 +281,8 @@ ostree_installer = [
         "aarch64": {
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/35/Fedora-35-20211026.0/compose/Everything/$arch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/"
             ],
             "release": None,
             "rootfs_size": "4",
@@ -290,16 +294,17 @@ ostree_installer = [
                 "ostree_osname=fedora-iot",
                 "ostree_oskey=fedora-35-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': 'f35',
         },
         "armhfp": {
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/35/Fedora-35-20211026.0/compose/Everything/$arch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/"
             ],
             "release": None,
             "rootfs_size": "4",
@@ -311,16 +316,17 @@ ostree_installer = [
                 "ostree_osname=fedora-iot",
                 "ostree_oskey=fedora-35-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/armhfp/iot",
-                "ostree_update_ref=fedora/rawhide/armhfp/iot",
+                "ostree_install_ref=fedora/stable/armhfp/iot",
+                "ostree_update_ref=fedora/stable/armhfp/iot",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f35',
         },
         "x86_64": {
             "repo": [
                 "IoT",
-                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"
+                "https://kojipkgs.fedoraproject.org/compose/35/Fedora-35-20211026.0/compose/Everything/$arch/os/",
+                "https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/"
             ],
             "release": None,
             "rootfs_size": "4",
@@ -332,11 +338,11 @@ ostree_installer = [
                 "ostree_osname=fedora-iot",
                 "ostree_oskey=fedora-35-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': 'f35',
         }
     })
 ]

sync-release.sh

@@ -0,0 +1,53 @@
+#!/bin/sh
+set -x
+export LC_ALL=C
+LABEL=$1
+# Remove the label from arguments. It gets special treatment. Other arguments
+# to the script are passed to pungi-koji directly.
+shift
+CONFIG="fedora-iot.conf"
+TARGET_DIR="/mnt/koji/compose/iot"
+NIGHTLY=""
+DEST=$(pwd)
+DATE=$(date "+%Y%m%d")
+# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
+SHORT="Fedora-IoT"
+RELEASE="35"
+RELEASE_TITLE="35"
+COMPSFILE="comps-f35.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/35/"
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
+
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
+SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
+
+DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
+# Public URL the synced compose will wind up at, we put it in fedmsgs
+LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
+# Update fedmsg template
+#fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
+#fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
+
+$RSYNCPREFIX mkdir -p $DESTDIR
+# Tell interested persons that the rsync is starting (zomg!)
+#send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
+for dir in IoT metadata ;
+  do
+    $RSYNCPREFIX rsync -avhH --delete-after $DESTDIR/compose/$dir/ "$RSYNCTARGET/$dir/" ;
+    $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
+  done
+# Tell interested persons that the rsync is done.
+#send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
+# Tell everyone by fedmsg about the compose
+#send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
+#SUBJECT='Fedora IoT'$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
+#for tomail in $TOMAIL ; do
+#    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
+#         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+#done
+
+#find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14 -name Fedora-IoT-${RELEASE}\* -exec rm -rf {} \;

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')