Bump rawhide to Fedora 46

- nightly.sh: Update fedora_messaging.sh path (scripts_new/ → no prefix)
- nightly.sh: Update build_composeinfo path (scripts/ → builds/compose/)
- twoweek-nightly.sh: Update fedora_messaging.sh path (scripts_new/ → no prefix)
- twoweek-nightly.sh: Update build_composeinfo path (scripts/ → builds/compose/)

Assisted-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>

fedora-iot.conf

@@ -1,21 +1,21 @@
 # PRODUCT INFO
 release_name = 'Fedora-IoT'
 release_short = 'Fedora-IoT'
-release_version = '42'
+release_version = '46'
 # Let's not build install media during this run. For the image builds
-# and OSTree installer we'll use inputs from other f42 runs.
+# and OSTree installer we'll use inputs from other f45 runs.
 skip_phases = ["buildinstall", "createrepo", "extra_files"]
 
 # GENERAL SETTINGS
 comps_file = {
     'scm': 'git',
-    'repo': 'https://pagure.io/fedora-comps.git',
+    'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git',
     'branch': 'main',
-    'file': 'comps-f42.xml',
-    'command': 'make comps-f42.xml'
+    'file': 'comps-f46.xml',
+    'command': 'make comps-f46.xml'
 }
 variants_file='variants-fedora.xml'
-sigkeys = ['105ef944']
+sigkeys = ['91211FCE']
 
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
@@ -27,7 +27,7 @@ hashed_directories = True
 
 # RUNROOT settings
 runroot_channel = 'compose'
-runroot_tag = 'f42-build'
+runroot_tag = 'f46-build'
 
 # PKGSET
 pkgset_source = 'koji' # koji, repos
@@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos
 # pkgset_repos = {}
 
 # PKGSET - KOJI
-pkgset_koji_tag = 'f42-iot'
+pkgset_koji_tag = 'f46-iot'
 pkgset_koji_inherit = False
 
 filter_system_release_packages = False
@@ -87,6 +87,13 @@ lorax_options = [
   })
 ]
 
+additional_packages = [
+    ('^IoT$$', {
+        '*': [
+            '*',
+        ],
+    }),
+]
 multilib = [
     ('^Everything$', {
         'x86_64': ['devel', 'runtime'],
@@ -159,7 +166,7 @@ image_volid_layered_product_formats = []
 # allow Pungi to tell it what volume ID to use. Note:
 # https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
 # '-Workstation-' is a temporary workaround. See
-# https://pagure.io/pungi-fedora/pull-request/525
+# https://forge.fedoraproject.org/releng/pungi-fedora/pulls/525
 volume_id_substitutions = {
                  'Beta': 'B',
               'Rawhide': 'rawh',
@@ -176,7 +183,7 @@ volume_id_substitutions = {
                   'IoT': 'iot',
               'Jam_KDE': 'Jam',
           'MATE_Compiz': 'MATE',
-     # Note https://pagure.io/pungi-fedora/issue/533
+     # Note https://forge.fedoraproject.org/releng/pungi-fedora/issues/533
      'Python-Classroom': 'Clss',
      'Python_Classroom': 'Clss',
              'Robotics': 'Robo',
@@ -195,26 +202,103 @@ translate_paths = [
    ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
 ]
 
-# These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
+# These may be inherited by various phases for creating Koji tasks
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = '42'
-# live_images ignores this in favor of live_target
-global_target = 'f42'
+global_version = '46'
+global_target = 'f46'
+
+imagebuilder_target = 'f46-image-builder'
+imagebuilder = {
+    "^IoT$": [
+      {
+        "name": "%s-raw" % release_name,
+        "types": ["iot-raw-xz"],
+        "arches": ["x86_64", "aarch64"],
+        "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
+        "ostree": {
+           "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
+           "ref": "fedora/rawhide/$arch/iot",
+        },
+        "subvariant": "IoT",
+        "failable": ["*"],
+      },
+      {
+        "name": "%s-ostree" % release_name,
+        "types": ["iot-installer"],
+        "arches": ["x86_64", "aarch64"],
+        "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
+        "ostree": {
+           "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
+           "ref": "fedora/rawhide/$arch/iot",
+        },
+        "subvariant": "IoT",
+        "manifest_type": "dvd-ostree",
+        "failable": ["*"],
+      },
+      {
+        "name": "%s-provisioner" % release_name,
+        "types": ["iot-simplified-installer"],
+        "arches": ["x86_64", "aarch64"],
+        "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
+        "ostree": {
+           "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
+           "ref": "fedora/rawhide/$arch/iot",
+        },
+        "blueprint": {
+            "customizations": {
+                "installation_device": "/dev/vda1",
+            },
+        },
+        "subvariant": "IoT_Simplified_Provisioner",
+        "failable": ["*"],
+        "manifest_type": "dvd-ostree",
+      },
+ ],
+}
+
+ostree = {
+    "^IoT$": {
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "force_new_commit": True,
+            "unified_core": True,
+            "treefile": "fedora-iot.yaml",
+            "config_url": "https://forge.fedoraproject.org/iot/ostree.git",
+            "config_branch": "main",
+            "repo": [
+                "IoT",
+                "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
+            ]
+            "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/iot/repo/",
+            "ostree_ref": "fedora/rawhide/${basearch}/iot",
+            "runroot_packages": ["selinux-policy-targeted"],
+            "arches": ["x86_64", "aarch64"],
+            "update_summary": True,
+        }
+}
 
 ostree_container = {
     "^IoT$": [
         {
-             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
-             "config_url": "https://pagure.io/fedora-iot/base-images",
-             "config_branch": "main",
-             "treefile": "fedora-42.yaml",
-             "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$basearch/os/",
-                      "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$basearch/os/"],
-             "arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
-             "failable": ['*'],
-             "subvariant": "base",
-             "name": "Fedora-base-bootc",
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "config_url": "https://forge.fedoraproject.org/iot/base-images.git",
+            "config_branch": "main",
+            "treefile": "fedora-rawhide.yaml",
+            "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
+            "arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
+            "failable": ['*'],
+            "subvariant": "base",
+            "name": "Fedora-base-bootc",
+        },
+        {
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "config_url": "https://forge.fedoraproject.org/iot/fedora-iot-bootc.git",
+            "config_branch": "main",
+            "treefile": "fedora-iot-rawhide.yaml",
+            "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
+            "arches": ["x86_64", "aarch64"],
+            "failable": ['*'],
+            "name": "Fedora-IoT-bootc",
         },
     ]
 }

nightly.sh

@@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 SHORT="Fedora-IoT"
-RELEASE="42"
-RELEASE_TITLE="42"
-COMPSFILE="comps-f42.xml"
+RELEASE="46"
+RELEASE_TITLE="46"
+COMPSFILE="comps-f46.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="iot@lists.fedoraproject.org"
 FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
@@ -30,20 +30,20 @@ if [ -d releng ]; then
     git pull --rebase
     popd
 else
-    git clone https://pagure.io/releng.git
+    git clone https://forge.fedoraproject.org/releng/tooling.git releng
 fi
 
 # Set up our fedmsg function, using the releng repo definition
 #FEDMSG_MODNAME="compose"
 #FEDMSG_CERTPREFIX="releng"
-. ./releng/scripts_new/infrastructure/messaging/fedora_messaging.sh
+. ./releng/infrastructure/messaging/fedora_messaging.sh
 
 # Announce that we are starting, even though we don't know the compose_id yet..
 #fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
 #send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
 
 #pushd $TMPDIR
-#git clone https://pagure.io/fedora-comps.git && {
+#git clone https://forge.fedoraproject.org/releng/fedora-comps.git && {
 #    pushd fedora-comps
 #    make "${COMPSFILE}"
 #    cp "${COMPSFILE}" $DEST/
@@ -67,7 +67,7 @@ fi
 NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
 
-./releng/scripts/build_composeinfo "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID"
+./releng/builds/compose/build_composeinfo.py "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID"
 
 # Set this to use later for a few items include depcheck
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID

sync-bootc-base-containers.sh

@@ -47,9 +47,9 @@ arch_to_goarch() {
 
 # This is the release of Fedora that is currently stable, it will define if we
 # need to move the fedora:latest tag
-current_stable="43"
+current_stable="44"
 # Define what is rawhide so we know to push that tag
-current_rawhide="44"
+current_rawhide="46"
 # Sanity checking
 if ! [[ "${1}" =~ ^-?[0-9]+$ ]];
 then

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="42"
-RELEASE_TITLE="42"
-COMPSFILE="comps-f42.xml"
+RELEASE="46"
+RELEASE_TITLE="46"
+COMPSFILE="comps-f46.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/42/"
+RSYNCTARGET="/pub/alt/iot/46/"
 OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 
 NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)

twoweek-nightly.sh

@@ -11,14 +11,14 @@ DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-IoT"
-RELEASE="42"
-RELEASE_TITLE="42"
-COMPSFILE="comps-f42.xml"
+RELEASE="46"
+RELEASE_TITLE="46"
+COMPSFILE="comps-f46.xml"
 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/branched/"
+RSYNCTARGET="/pub/alt/iot/rawhide/"
 OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 
 # assume a releng dir is a git checkout of the releng repo
@@ -28,13 +28,13 @@ if [ -d releng ]; then
     git pull --rebase
     popd
 else
-    git clone https://pagure.io/releng.git
+    git clone https://forge.fedoraproject.org/releng/tooling.git releng
 fi
 # Set up our fedmsg function, using the releng repo definition
 fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
 FEDMSG_MODNAME="compose"
 FEDMSG_CERTPREFIX="releng"
-. ./releng/scripts_new/infrastructure/messaging/fedora_messaging.sh
+. ./releng/infrastructure/messaging/fedora_messaging.sh
 # Announce that we are starting...
 send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
 CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"
@@ -52,7 +52,7 @@ ostree summary --update --repo=/mnt/koji/compose/iot/repo/
 NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
 
-./releng/scripts/build_composeinfo "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID"
+./releng/builds/compose/build_composeinfo.py "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID"
 
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
 # Public URL the synced compose will wind up at, we put it in fedmsgs
@@ -67,7 +67,7 @@ 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
+    $RSYNCPREFIX ./releng/builds/compose/build_composeinfo.py "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
   done
 # Tell everyone by fedmsg about the compose
 send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete

variants-fedora.xml

@@ -4,9 +4,9 @@
     <variant id="IoT" name="IoT" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
-            <arch>x86_64</arch>
-            <arch>ppc64le</arch>
-            <arch>s390x</arch>
+	    <arch>x86_64</arch>
+	    <arch>ppc64le</arch>
+	    <arch>s390x</arch>
         </arches>
     </variant>
 </variants>