From d3d5ad9d8baa405e1b03a9341372848c3b01a9ac Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 11 Aug 2025 14:16:15 -0400 Subject: [PATCH 1/5] F-43: Update for branching Signed-off-by: Paul Whalen --- fedora-iot.conf | 28 ++++++++++++++-------------- sync-bootc-base-containers.sh | 2 +- twoweek-nightly.sh | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index dc73fbe..c64abb5 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -203,7 +203,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/f43' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '43' # live_images ignores this in favor of live_target @@ -216,10 +216,10 @@ imagebuilder = { "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/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", + "ref": "fedora/devel/$arch/iot", }, "subvariant": "IoT", "failable": ["*"], @@ -228,10 +228,10 @@ imagebuilder = { "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/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", + "ref": "fedora/devel/$arch/iot", }, "subvariant": "IoT", "manifest_type": "dvd-ostree", @@ -241,10 +241,10 @@ imagebuilder = { "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/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", + "ref": "fedora/devel/$arch/iot", }, "blueprint": { "customizations": { @@ -265,14 +265,14 @@ ostree = { "unified_core": True, "treefile": "fedora-iot.yaml", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", + "config_branch": "f43", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/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", "runroot_packages": ["selinux-policy-targeted"], "arches": ["x86_64", "aarch64"], "update_summary": True, @@ -285,8 +285,8 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", - "treefile": "fedora-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "treefile": "fedora-43.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], "subvariant": "base", @@ -296,8 +296,8 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-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/"], + "treefile": "fedora-iot-43.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], "name": "Fedora-IoT-bootc", diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 6a7e03f..50c8e4b 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -49,7 +49,7 @@ arch_to_goarch() { # need to move the fedora:latest tag current_stable="41" # Define what is rawhide so we know to push that tag -current_rawhide="43" +current_rawhide="44" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 560183d..5cb6f7e 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 " 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 From 4c7bf93c0ac9bf293ded3ace0ef62c16b3c1dd2e Mon Sep 17 00:00:00 2001 From: Anton Medvedev Date: Tue, 7 Oct 2025 21:47:12 +0200 Subject: [PATCH 2/5] ref: fix path effected by releng repo refactoring Signed-off-by: Anton Medvedev --- nightly.sh | 2 +- twoweek-nightly.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nightly.sh b/nightly.sh index 343e11e..1937002 100755 --- a/nightly.sh +++ b/nightly.sh @@ -36,7 +36,7 @@ fi # Set up our fedmsg function, using the releng repo definition #FEDMSG_MODNAME="compose" #FEDMSG_CERTPREFIX="releng" -. ./releng/scripts/fedmsg-functions.sh +. ./releng/scripts_new/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") diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 5cb6f7e..6971fb4 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -34,7 +34,7 @@ fi fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT") FEDMSG_MODNAME="compose" FEDMSG_CERTPREFIX="releng" -. ./releng/scripts/fedmsg-functions.sh +. ./releng/scripts_new/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" From af66bc550a4fe6c0ea5d3b4d9870d8edb5daa2f5 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 23 Oct 2025 17:00:31 -0400 Subject: [PATCH 3/5] F43: Update for final Signed-off-by: Paul Whalen --- fedora-iot.conf | 20 ++++++++++---------- sync-bootc-base-containers.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index c64abb5..c7f3dec 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -216,10 +216,10 @@ imagebuilder = { "name": "%s-raw" % release_name, "types": ["iot-raw-xz"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/devel/$arch/iot", + "ref": "fedora/stable/$arch/iot", }, "subvariant": "IoT", "failable": ["*"], @@ -228,10 +228,10 @@ imagebuilder = { "name": "%s-ostree" % release_name, "types": ["iot-installer"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/devel/$arch/iot", + "ref": "fedora/stable/$arch/iot", }, "subvariant": "IoT", "manifest_type": "dvd-ostree", @@ -241,10 +241,10 @@ imagebuilder = { "name": "%s-provisioner" % release_name, "types": ["iot-simplified-installer"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/devel/$arch/iot", + "ref": "fedora/stable/$arch/iot", }, "blueprint": { "customizations": { @@ -268,11 +268,11 @@ ostree = { "config_branch": "f43", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", - "ostree_ref": "fedora/devel/${basearch}/iot", + "ostree_ref": "fedora/stable/${basearch}/iot", "runroot_packages": ["selinux-policy-targeted"], "arches": ["x86_64", "aarch64"], "update_summary": True, @@ -286,7 +286,7 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", "treefile": "fedora-43.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], "subvariant": "base", @@ -297,7 +297,7 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", "config_branch": "main", "treefile": "fedora-iot-43.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-43/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], "name": "Fedora-IoT-bootc", diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 50c8e4b..21b6652 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -47,7 +47,7 @@ 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="41" +current_stable="43" # Define what is rawhide so we know to push that tag current_rawhide="44" # Sanity checking From 820b7a487dfdb878084627467f321c4abf3572ff Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 28 Oct 2025 10:59:51 -0400 Subject: [PATCH 4/5] f43: enable updates Signed-off-by: Paul Whalen --- fedora-iot.conf | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index c7f3dec..a8a0242 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -216,7 +216,8 @@ imagebuilder = { "name": "%s-raw" % release_name, "types": ["iot-raw-xz"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ref": "fedora/stable/$arch/iot", @@ -228,7 +229,8 @@ imagebuilder = { "name": "%s-ostree" % release_name, "types": ["iot-installer"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ref": "fedora/stable/$arch/iot", @@ -241,7 +243,8 @@ imagebuilder = { "name": "%s-provisioner" % release_name, "types": ["iot-simplified-installer"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ref": "fedora/stable/$arch/iot", @@ -268,8 +271,8 @@ ostree = { "config_branch": "f43", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/" - ] + "https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$basearch/os/"], "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_ref": "fedora/stable/${basearch}/iot", @@ -286,7 +289,8 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", "treefile": "fedora-43.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], "subvariant": "base", @@ -297,7 +301,8 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", "config_branch": "main", "treefile": "fedora-iot-43.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], "name": "Fedora-IoT-bootc", From 189d8c632a7e33faeac50200761fba533be89210 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 24 Apr 2026 11:34:53 -0400 Subject: [PATCH 5/5] f43: Remove IoT, only compose fedora-bootc container Generated-by: Claude Code Signed-off-by: Paul Whalen --- fedora-iot.conf | 91 ------------------------------------------------- 1 file changed, 91 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a8a0242..f986dc0 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -87,13 +87,6 @@ lorax_options = [ }) ] -additional_packages = [ - ('^IoT$$', { - '*': [ - '*', - ], - }), -] multilib = [ ('^Everything$', { 'x86_64': ['devel', 'runtime'], @@ -209,79 +202,6 @@ global_version = '43' # live_images ignores this in favor of live_target global_target = 'f43' -imagebuilder_target = 'f43-image-builder' -imagebuilder = { - "^IoT$": [ - { - "name": "%s-raw" % release_name, - "types": ["iot-raw-xz"], - "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$arch/os/"], - "ostree": { - "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/stable/$arch/iot", - }, - "subvariant": "IoT", - "failable": ["*"], - }, - { - "name": "%s-ostree" % release_name, - "types": ["iot-installer"], - "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$arch/os/"], - "ostree": { - "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/stable/$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/43/Fedora-43-20251023.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$arch/os/"], - "ostree": { - "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/stable/$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://pagure.io/fedora-iot/ostree.git", - "config_branch": "f43", - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$basearch/os/"], - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/iot/repo/", - "ostree_ref": "fedora/stable/${basearch}/iot", - "runroot_packages": ["selinux-policy-targeted"], - "arches": ["x86_64", "aarch64"], - "update_summary": True, - } -} - ostree_container = { "^IoT$": [ { @@ -296,17 +216,6 @@ ostree_container = { "subvariant": "base", "name": "Fedora-base-bootc", }, - { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", - "config_branch": "main", - "treefile": "fedora-iot-43.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f43-updates/compose/Everything/$basearch/os/"], - "arches": ["x86_64", "aarch64"], - "failable": ['*'], - "name": "Fedora-IoT-bootc", - }, ] }