From 4a5226f14485b5a473ba0821dc757b22598e2fc1 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 5 Feb 2025 11:28:28 -0500 Subject: [PATCH 01/10] F-42: Update for branching Signed-off-by: Paul Whalen --- fedora-iot.conf | 26 +++++++++++++------------- sync-bootc-base-containers.sh | 2 +- twoweek-nightly.sh | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a864c54..7e33509 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -217,9 +217,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-42/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", }, { @@ -228,9 +228,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-42/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", "manifest_type": "dvd-ostree", }, @@ -240,9 +240,9 @@ osbuild = { "image_types": ["iot-simplified-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-42/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_Simplified_Provisioner", "customizations": {"installation_device": "/dev/vda"}, "failable": ["*"], @@ -258,14 +258,14 @@ ostree = { "unified_core": True, "treefile": "fedora-iot.yaml", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", + "config_branch": "f42", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/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, @@ -276,18 +276,18 @@ ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", - "config_branch": "main", + "config_branch": "f42", "treefile": "fedora-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], }, "^bootc-base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", - "config_branch": "main", + "config_branch": "f42", "treefile": "fedora-iot-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], }, diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index ee24432..6a7e03f 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="42" +current_rawhide="43" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 7d8d312..0dbb13b 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 fe4902974d16c42c961e9b2ba692311f2c5f8f3a Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 5 Feb 2025 15:23:27 -0500 Subject: [PATCH 02/10] F-42: containers should use main Signed-off-by: Paul Whalen --- fedora-iot.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 7e33509..5b846a4 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -276,8 +276,8 @@ ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", - "config_branch": "f42", - "treefile": "fedora-rawhide.yaml", + "config_branch": "main", + "treefile": "fedora-42.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], @@ -285,8 +285,8 @@ ostree_container = { "^bootc-base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", - "config_branch": "f42", - "treefile": "fedora-iot-rawhide.yaml", + "config_branch": "main", + "treefile": "fedora-iot-42.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], From 3a39253ac369bedde4eb566e70d437fc2edac3da Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 10 Feb 2025 10:39:35 -0500 Subject: [PATCH 03/10] Make f42 osbuild deliverables failable due to koji network issues Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 5b846a4..79e129c 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -221,6 +221,7 @@ osbuild = { "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/devel/$arch/iot", "subvariant": "IoT", + "failable": ["*"] }, { "name": "%s-ostree" % release_name, @@ -232,6 +233,7 @@ osbuild = { "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/devel/$arch/iot", "subvariant": "IoT", + "failable": ["*"] "manifest_type": "dvd-ostree", }, { From f9ca24002c7cda80fbd07d5995941c103630cdc9 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 10 Apr 2025 15:03:26 -0400 Subject: [PATCH 04/10] F42: 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 79e129c..5eaf60b 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -217,9 +217,9 @@ osbuild = { "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/devel/$arch/iot", + "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", "failable": ["*"] }, @@ -229,9 +229,9 @@ osbuild = { "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/devel/$arch/iot", + "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", "failable": ["*"] "manifest_type": "dvd-ostree", @@ -242,9 +242,9 @@ osbuild = { "image_types": ["iot-simplified-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/devel/$arch/iot", + "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT_Simplified_Provisioner", "customizations": {"installation_device": "/dev/vda"}, "failable": ["*"], @@ -263,11 +263,11 @@ ostree = { "config_branch": "f42", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.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, @@ -280,7 +280,7 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", "treefile": "fedora-42.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], }, @@ -289,7 +289,7 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", "config_branch": "main", "treefile": "fedora-iot-42.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-42/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], }, diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 6a7e03f..f0af86f 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="42" # Define what is rawhide so we know to push that tag current_rawhide="43" # Sanity checking From 04262754cfa5df053113636ec85162dc359642ed Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 22 Apr 2025 09:16:45 -0400 Subject: [PATCH 05/10] Enable updates repo for Fedora 42 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 5eaf60b..d92f34d 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -217,7 +217,8 @@ osbuild = { "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", @@ -229,7 +230,8 @@ osbuild = { "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", @@ -242,7 +244,8 @@ osbuild = { "image_types": ["iot-simplified-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT_Simplified_Provisioner", @@ -263,8 +266,8 @@ ostree = { "config_branch": "f42", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$basearch/os/" - ] + "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/"], "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_ref": "fedora/stable/${basearch}/iot", @@ -280,7 +283,8 @@ ostree_container = { "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/"], + "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": ['*'], }, @@ -289,7 +293,8 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", "config_branch": "main", "treefile": "fedora-iot-42.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$basearch/os/"], + "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"], "failable": ['*'], }, From 1df1af174bc6f904b2d89f719fe0b390ee7f2484 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 24 Apr 2025 15:02:45 -0400 Subject: [PATCH 06/10] Build bootc images in IoT variant, tweak subvariants and names See: https://pagure.io/fedora-iot/pungi-iot/pull-request/102 https://pagure.io/fedora-iot/pungi-iot/pull-request/138 Signed-off-by: Paul Whalen --- fedora-iot.conf | 47 +++++++++++++++++++++++++-------------------- variants-fedora.xml | 12 ------------ 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index d92f34d..acaf5ab 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -22,7 +22,7 @@ sigkeys = ['105ef944'] tree_arches = ['aarch64', 'x86_64', "ppc64le", "s390x"] # limit tree variants # if undefined, all variants from variants.xml will be included -tree_variants = ['IoT', 'bootc', 'bootc-base'] +tree_variants = ['IoT'] hashed_directories = True # RUNROOT settings @@ -278,26 +278,31 @@ ostree = { } ostree_container = { - "^bootc$": { - "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": ['*'], - }, - "^bootc-base$": { - "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-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"], - "failable": ['*'], - }, + "^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": ['*'], + "name": "Fedora-IoT-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-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"], + "failable": ['*'], + "subvariant": "base", + "name": "Fedora-base-bootc", + }, + ] } koji_profile = 'compose_koji' diff --git a/variants-fedora.xml b/variants-fedora.xml index 9deb115..dd5706e 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -2,18 +2,6 @@ - - aarch64 - x86_64 - - - - - aarch64 - x86_64 - - - aarch64 x86_64 From e966d05e194c9ef3d2eff2700ed80e914c3a5604 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 25 Apr 2025 17:13:28 -0400 Subject: [PATCH 07/10] F42: Fix container names to reflect content in the image This fixes the container names to reflect the content in the image. Fedora-IoT-bootc - iot image Fedora-base-bootc - generic base image Signed-off-by: Paul Whalen --- fedora-iot.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index acaf5ab..9b3a9bf 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -288,7 +288,8 @@ ostree_container = { "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], - "name": "Fedora-IoT-bootc", + "subvariant": "base", + "name": "Fedora-base-bootc", }, { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", @@ -299,8 +300,7 @@ ostree_container = { "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], - "subvariant": "base", - "name": "Fedora-base-bootc", + "name": "Fedora-IoT-bootc", }, ] } From 86fe5a11ace4fd3148388fbe3047b775c41b7b35 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 29 Apr 2025 09:37:44 -0400 Subject: [PATCH 08/10] F42: Stop running the container sync script, replaced by cloud-image-uploader Signed-off-by: Paul Whalen --- twoweek-nightly.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 0dbb13b..c029024 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -69,10 +69,6 @@ for dir in IoT metadata ; $RSYNCPREFIX rsync -avhH --delete-after $DESTDIR/compose/$dir/ "$RSYNCTARGET/$dir/" ; $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID done -# Push containers -./sync-bootc-base-containers.sh ${RELEASE} ${LABEL} -# 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 '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes' From 706c0f4a3d9ce93b1d17044124b05eb2f2b1593e Mon Sep 17 00:00:00 2001 From: Anton Medvedev Date: Tue, 7 Oct 2025 21:51:36 +0200 Subject: [PATCH 09/10] 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 a6675b7..dff8421 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 c029024..1e34eb5 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 02a4a8f402d28d406916f117e1103ab89391b3b8 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 23 Oct 2025 15:33:57 -0400 Subject: [PATCH 10/10] Remove IoT, only compose fedora-bootc container Signed-off-by: Paul Whalen --- fedora-iot.conf | 86 ----------------------------------- sync-bootc-base-containers.sh | 4 +- 2 files changed, 2 insertions(+), 88 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 9b3a9bf..5c973d0 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,74 +202,6 @@ global_version = '42' # live_images ignores this in favor of live_target global_target = 'f42' -osbuild = { - "^IoT$": [ - { - "name": "%s-raw" % release_name, - "distro": "fedora-42", - "image_types": ["iot-raw-image"], - "target": "f%s-candidate" % release_version, - "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/stable/$arch/iot", - "subvariant": "IoT", - "failable": ["*"] - }, - { - "name": "%s-ostree" % release_name, - "distro": "fedora-42", - "image_types": ["iot-installer"], - "target": "f%s-candidate" % release_version, - "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/stable/$arch/iot", - "subvariant": "IoT", - "failable": ["*"] - "manifest_type": "dvd-ostree", - }, - { - "name": "%s-provisioner" % release_name, - "distro": "fedora-42", - "image_types": ["iot-simplified-installer"], - "target": "f%s-candidate" % release_version, - "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/stable/$arch/iot", - "subvariant": "IoT_Simplified_Provisioner", - "customizations": {"installation_device": "/dev/vda"}, - "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": "f42", - "repo": [ - "IoT", - "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/"], - "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$": [ { @@ -291,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-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"], - "failable": ['*'], - "name": "Fedora-IoT-bootc", - }, ] } diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index f0af86f..21b6652 100755 --- a/sync-bootc-base-containers.sh +++ b/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="42" +current_stable="43" # Define what is rawhide so we know to push that tag -current_rawhide="43" +current_rawhide="44" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then