From 8793fd5b80e3c269bac84cda175f5bf9987eea99 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 13 Feb 2024 14:49:00 -0500 Subject: [PATCH 01/83] F-40: Update for branching Signed-off-by: Paul Whalen --- fedora-iot.conf | 20 ++++++++++---------- twoweek-nightly.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 8c35a1c..7bed0b4 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/f40' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '40' # live_images ignores this in favor of live_target @@ -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-40/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-40/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-bootable-container"], "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-40/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", "failable": ["*"], }, @@ -256,14 +256,14 @@ ostree = { "unified_core": True, "treefile": "fedora-iot.yaml", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", + "config_branch": "f40", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-40/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, diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 717a35f..95a15fd 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 db00b44a9ddf0eb37c4194b089bbea799cb3ecb6 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 13 Feb 2024 15:06:38 -0500 Subject: [PATCH 02/83] F-41: Update for branching Signed-off-by: Paul Whalen --- fedora-iot.conf | 24 ++++++++++++------------ nightly.sh | 6 +++--- sync-release.sh | 8 ++++---- twoweek-nightly.sh | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 8c35a1c..ae8064e 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,9 +1,9 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '40' +release_version = '41' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f40 runs. +# and OSTree installer we'll use inputs from other f41 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] # GENERAL SETTINGS @@ -11,11 +11,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f40.xml', - 'command': 'make comps-f40.xml' + 'file': 'comps-f41.xml', + 'command': 'make comps-f41.xml' } variants_file='variants-fedora.xml' -sigkeys = ['a15B79cc'] +sigkeys = ['e99d6ad1'] # 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 = 'f40-build' +runroot_tag = 'f41-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f40-iot' +pkgset_koji_tag = 'f41-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -205,15 +205,15 @@ 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_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '40' +global_version = '41' # live_images ignores this in favor of live_target -global_target = 'f40' +global_target = 'f41' osbuild = { "^IoT$": [ { "name": "%s" % release_name, - "distro": "fedora-40", + "distro": "fedora-41", "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -224,7 +224,7 @@ osbuild = { }, { "name": "%s-ostree" % release_name, - "distro": "fedora-40", + "distro": "fedora-41", "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -236,7 +236,7 @@ osbuild = { }, { "name": "%s" % release_name, - "distro": "fedora-40", + "distro": "fedora-41", "image_types": ["iot-bootable-container"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], diff --git a/nightly.sh b/nightly.sh index cf44a8f..e42e037 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="40" -RELEASE_TITLE="40" -COMPSFILE="comps-f40.xml" +RELEASE="41" +RELEASE_TITLE="41" +COMPSFILE="comps-f41.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " diff --git a/sync-release.sh b/sync-release.sh index a14c16d..b2b7276 100755 --- a/sync-release.sh +++ b/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="40" -RELEASE_TITLE="40" -COMPSFILE="comps-f40.xml" +RELEASE="41" +RELEASE_TITLE="41" +COMPSFILE="comps-f41.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/40/" +RSYNCTARGET="/pub/alt/iot/41/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 717a35f..4e28f65 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="40" -RELEASE_TITLE="40" -COMPSFILE="comps-f40.xml" +RELEASE="41" +RELEASE_TITLE="41" +COMPSFILE="comps-f41.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " From ecca26e80a8c435a25929ea546d814bfc4d406f3 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 15 Feb 2024 11:03:35 -0500 Subject: [PATCH 03/83] Fix names for osbuild deliverables Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index ae8064e..f26e13f 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -212,7 +212,7 @@ global_target = 'f41' osbuild = { "^IoT$": [ { - "name": "%s" % release_name, + "name": "%s-raw" % release_name, "distro": "fedora-41", "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, @@ -235,7 +235,7 @@ osbuild = { "manifest_type": "dvd-ostree", }, { - "name": "%s" % release_name, + "name": "%s-oci" % release_name, "distro": "fedora-41", "image_types": ["iot-bootable-container"], "target": "f%s-candidate" % release_version, From 16b70e0849f70766fe8cb825514d969b4829834c Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 15 Feb 2024 14:07:41 -0500 Subject: [PATCH 04/83] Fix names for osbuild deliverables Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 7bed0b4..6c5639e 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -212,7 +212,7 @@ global_target = 'f40' osbuild = { "^IoT$": [ { - "name": "%s" % release_name, + "name": "%s-raw" % release_name, "distro": "fedora-40", "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, @@ -235,7 +235,7 @@ osbuild = { "manifest_type": "dvd-ostree", }, { - "name": "%s" % release_name, + "name": "%s-oci" % release_name, "distro": "fedora-40", "image_types": ["iot-bootable-container"], "target": "f%s-candidate" % release_version, From 523b1f29397ed737f71112f97ed326d190a4cb46 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Sat, 17 Feb 2024 10:18:19 -0500 Subject: [PATCH 05/83] F41: Add simplified provisioning Signed-off-by: Paul Whalen --- fedora-iot.conf | 13 +++++++++++++ simp-prov-install-device.json | 1 + 2 files changed, 14 insertions(+) create mode 100644 simp-prov-install-device.json diff --git a/fedora-iot.conf b/fedora-iot.conf index f26e13f..3fda4ba 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -246,6 +246,19 @@ osbuild = { "subvariant": "IoT", "failable": ["*"], }, + { + "name": "%s-sp" % release_name, + "distro": "fedora-41", + "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/"], + "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", + "ostree_ref": "fedora/rawhide/$arch/iot", + "subvariant": "IoT", + "customizations": "simp-prov-install-device.json", + "failable": ["*"], + }, ], } diff --git a/simp-prov-install-device.json b/simp-prov-install-device.json new file mode 100644 index 0000000..eba803b --- /dev/null +++ b/simp-prov-install-device.json @@ -0,0 +1 @@ +{"installation_device":"/dev/vda"} From 2be18ba45debd984c355d940e444b19155bccd39 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 5 Mar 2024 16:23:36 -0500 Subject: [PATCH 06/83] Simplified Provisioning: update customizations Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- simp-prov-install-device.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 simp-prov-install-device.json diff --git a/fedora-iot.conf b/fedora-iot.conf index 3fda4ba..ef1f5fa 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -256,7 +256,7 @@ osbuild = { "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/rawhide/$arch/iot", "subvariant": "IoT", - "customizations": "simp-prov-install-device.json", + "customizations": {"installation_device": "/dev/vda"}, "failable": ["*"], }, ], diff --git a/simp-prov-install-device.json b/simp-prov-install-device.json deleted file mode 100644 index eba803b..0000000 --- a/simp-prov-install-device.json +++ /dev/null @@ -1 +0,0 @@ -{"installation_device":"/dev/vda"} From b45ec3b7c41795f3d31792afa786b09f0c2ef476 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 5 Mar 2024 17:34:01 -0500 Subject: [PATCH 07/83] F40: Add simplified provisioning deliverable Signed-off-by: Paul Whalen --- fedora-iot.conf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 6c5639e..e9e1857 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -246,6 +246,19 @@ osbuild = { "subvariant": "IoT", "failable": ["*"], }, + { + "name": "%s-sp" % release_name, + "distro": "fedora-40", + "image_types": ["iot-simplified-installer"], + "target": "f%s-candidate" % release_version, + "arches": ["x86_64", "aarch64"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-40/compose/Everything/$arch/os/"], + "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", + "ostree_ref": "fedora/devel/$arch/iot", + "subvariant": "IoT", + "customizations": {"installation_device": "/dev/vda"}, + "failable": ["*"], + }, ], } From 6fe1714a76218f0f01e3f40b5d1e67d25c5e403f Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 6 Mar 2024 09:39:26 -0500 Subject: [PATCH 08/83] F41: Change bootable-container name to -bootc Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index ef1f5fa..030f5b9 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -235,7 +235,7 @@ osbuild = { "manifest_type": "dvd-ostree", }, { - "name": "%s-oci" % release_name, + "name": "%s-bootc" % release_name, "distro": "fedora-41", "image_types": ["iot-bootable-container"], "target": "f%s-candidate" % release_version, From ce5eaa7cff224ee598083a33a2f49db59486e894 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 6 Mar 2024 09:58:13 -0500 Subject: [PATCH 09/83] F40: Change bootable-container name to -bootc Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index e9e1857..507ffec 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -235,7 +235,7 @@ osbuild = { "manifest_type": "dvd-ostree", }, { - "name": "%s-oci" % release_name, + "name": "%s-bootc" % release_name, "distro": "fedora-40", "image_types": ["iot-bootable-container"], "target": "f%s-candidate" % release_version, From 9879308883b01f4f768d242a2c33082057b4dd2f Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 7 Mar 2024 11:05:07 -0500 Subject: [PATCH 10/83] F41: Change simplified-provisioning to -provisioner Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 030f5b9..1071e6a 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -247,7 +247,7 @@ osbuild = { "failable": ["*"], }, { - "name": "%s-sp" % release_name, + "name": "%s-provisioner" % release_name, "distro": "fedora-41", "image_types": ["iot-simplified-installer"], "target": "f%s-candidate" % release_version, From 2f6b6499437ee3b96d5a2539ff0c57e6aa83c364 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 7 Mar 2024 11:08:51 -0500 Subject: [PATCH 11/83] F40: Change simplified-provisioning to -provisioner Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 507ffec..c73246e 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -247,7 +247,7 @@ osbuild = { "failable": ["*"], }, { - "name": "%s-sp" % release_name, + "name": "%s-provisioner" % release_name, "distro": "fedora-40", "image_types": ["iot-simplified-installer"], "target": "f%s-candidate" % release_version, From 97376e7155950eaab0c25967950c081b66fe716a Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 11 Apr 2024 13:13:10 -0400 Subject: [PATCH 12/83] F41: Add base bootc container Signed-off-by: Paul Whalen --- fedora-iot.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 1071e6a..bf8e829 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -283,4 +283,15 @@ ostree = { } } +ostree_container = { + "^fedora-bootc$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/fedora-iot/ostree", + "config_branch": "main", + "treefile": "fedora-bootc.yaml", + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + }, +} + koji_profile = 'compose_koji' From 42a869f057e0759ef68fa36b7fc80c72cb686e27 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 15 Apr 2024 13:49:21 -0400 Subject: [PATCH 13/83] F41: Fix name and variant for base container Signed-off-by: Paul Whalen --- fedora-iot.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index bf8e829..a702ef3 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -284,7 +284,8 @@ ostree = { } ostree_container = { - "^fedora-bootc$": { + "^IoT$": { + "ociarchive_name": "fedora-bootc", "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/ostree", "config_branch": "main", From f046e86b9da2df9d04938a4e991cd571f61ff976 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 16 Apr 2024 09:22:53 -0400 Subject: [PATCH 14/83] F41: add bootc variant Signed-off-by: Paul Whalen --- fedora-iot.conf | 5 ++--- variants-fedora.xml | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a702ef3..01f28be 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -22,7 +22,7 @@ sigkeys = ['e99d6ad1'] tree_arches = ['aarch64', 'x86_64'] # limit tree variants # if undefined, all variants from variants.xml will be included -tree_variants = ['IoT'] +tree_variants = ['IoT', 'bootc'] hashed_directories = True # RUNROOT settings @@ -284,8 +284,7 @@ ostree = { } ostree_container = { - "^IoT$": { - "ociarchive_name": "fedora-bootc", + "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/ostree", "config_branch": "main", diff --git a/variants-fedora.xml b/variants-fedora.xml index fc87bb1..058a67d 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -7,4 +7,10 @@ x86_64 + + + aarch64 + x86_64 + + From 5bdfe5d0e43527e0799c11704f5add6dcebde63d Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 17 Apr 2024 10:41:31 -0400 Subject: [PATCH 15/83] F41: add repo to bootc Signed-off-by: Paul Whalen --- fedora-iot.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 01f28be..ce159b8 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -289,6 +289,7 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/ostree", "config_branch": "main", "treefile": "fedora-bootc.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], }, From 69a2072bdc9e56e17e1a30fcb511fbc31165b7f2 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 17 Apr 2024 16:36:28 -0400 Subject: [PATCH 16/83] F40: Add bootc image Signed-off-by: Paul Whalen --- fedora-iot.conf | 14 +++++++++++++- variants-fedora.xml | 6 ++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index c73246e..8c9aa16 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -22,7 +22,7 @@ sigkeys = ['a15B79cc'] tree_arches = ['aarch64', 'x86_64'] # limit tree variants # if undefined, all variants from variants.xml will be included -tree_variants = ['IoT'] +tree_variants = ['IoT', 'bootc'] hashed_directories = True # RUNROOT settings @@ -283,4 +283,16 @@ ostree = { } } +ostree_container = { + "^bootc$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/fedora-iot/ostree", + "config_branch": "f40", + "treefile": "fedora-bootc.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-40/compose/Everything/$basearch/os/"], + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + }, +} + koji_profile = 'compose_koji' diff --git a/variants-fedora.xml b/variants-fedora.xml index fc87bb1..058a67d 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -7,4 +7,10 @@ x86_64 + + + aarch64 + x86_64 + + From f7d69e8fcf70c8bd803c0265c86ad8fb41d59f71 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 19 Apr 2024 10:17:34 -0400 Subject: [PATCH 17/83] F41: use upstream bootc repo Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index ce159b8..3c84f42 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -286,7 +286,7 @@ ostree = { ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/ostree", + "config_url": "https://github.com/CentOS/centos-bootc", "config_branch": "main", "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], From a75c386bf719b41c7841058bac61342400b763a0 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 19 Apr 2024 14:21:41 -0400 Subject: [PATCH 18/83] F40: use upstream bootc repo Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 8c9aa16..7d7e860 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -286,8 +286,8 @@ ostree = { ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/ostree", - "config_branch": "f40", + "config_url": "https://github.com/CentOS/centos-bootc", + "config_branch": "main", "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-40/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], From 0dde79bc0f5d52046ebcfa56593d1acac44a4709 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Sun, 21 Apr 2024 17:34:21 -0400 Subject: [PATCH 19/83] F41: Use pagure bootc repo Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 3c84f42..5079fbd 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -286,7 +286,7 @@ ostree = { ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://github.com/CentOS/centos-bootc", + "config_url": "https://pagure.io/fedora-iot/fedora-bootc", "config_branch": "main", "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], From b6f101df008b850fb9ea9f8d1b5043617f05c333 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Sun, 21 Apr 2024 17:40:19 -0400 Subject: [PATCH 20/83] F40: Use pagure bootc repo Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 7d7e860..ffbbb8e 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -286,7 +286,7 @@ ostree = { ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://github.com/CentOS/centos-bootc", + "config_url": "https://pagure.io/fedora-iot/fedora-bootc", "config_branch": "main", "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-40/compose/Everything/$basearch/os/"], From 8c2e1a884f900d91760d3f0b2fc3f1c071cb60e7 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 22 Apr 2024 08:34:28 -0400 Subject: [PATCH 21/83] F40: Update for final Signed-off-by: Paul Whalen --- fedora-iot.conf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index ffbbb8e..bf91b17 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-40/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.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", }, { @@ -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/branched/latest-Fedora-40/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.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", "manifest_type": "dvd-ostree", }, @@ -240,9 +240,9 @@ osbuild = { "image_types": ["iot-bootable-container"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-40/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.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": ["*"], }, @@ -252,9 +252,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-40/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.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", "customizations": {"installation_device": "/dev/vda"}, "failable": ["*"], @@ -272,11 +272,11 @@ ostree = { "config_branch": "f40", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-40/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.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, @@ -289,7 +289,7 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/fedora-bootc", "config_branch": "main", "treefile": "fedora-bootc.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-40/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], }, From 220559ddd960f9f6e6108f11324f0a17e07a2079 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 23 Apr 2024 11:08:33 -0400 Subject: [PATCH 22/83] F40: 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 bf91b17..a95fc32 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/40/Fedora-40-20240414.0/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", @@ -228,7 +229,8 @@ osbuild = { "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", @@ -240,7 +242,8 @@ osbuild = { "image_types": ["iot-bootable-container"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", @@ -252,7 +255,8 @@ osbuild = { "image_types": ["iot-simplified-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", @@ -272,8 +276,8 @@ ostree = { "config_branch": "f40", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/" - ] + "https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_ref": "fedora/stable/${basearch}/iot", @@ -289,7 +293,8 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/fedora-bootc", "config_branch": "main", "treefile": "fedora-bootc.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], }, From 873ab7ef354625456c55f753d8ed53257298f606 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 27 Apr 2024 16:34:14 +0100 Subject: [PATCH 23/83] Move to base-images mirror repo Signed-off-by: Peter Robinson --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 5079fbd..157df74 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -286,7 +286,7 @@ ostree = { ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/fedora-bootc", + "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], From 49bbe467d95c92f01505329af58aee7dd2b8edc5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 27 Apr 2024 16:34:14 +0100 Subject: [PATCH 24/83] Move to base-images mirror repo Signed-off-by: Peter Robinson --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a95fc32..1b28518 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -290,7 +290,7 @@ ostree = { ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/fedora-bootc", + "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", From 800f3d993ec73298cd118fa7455e5c01d3e598cf Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 2 May 2024 17:39:40 -0400 Subject: [PATCH 25/83] 41: drop osbuild bootc container Signed-off-by: Paul Whalen --- fedora-iot.conf | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 157df74..142ac9e 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -234,18 +234,6 @@ osbuild = { "subvariant": "IoT", "manifest_type": "dvd-ostree", }, - { - "name": "%s-bootc" % release_name, - "distro": "fedora-41", - "image_types": ["iot-bootable-container"], - "target": "f%s-candidate" % release_version, - "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/rawhide/$arch/iot", - "subvariant": "IoT", - "failable": ["*"], - }, { "name": "%s-provisioner" % release_name, "distro": "fedora-41", From b2beebd8d62b3071b8260f1f802f5c3ca6907cf7 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 2 May 2024 17:42:49 -0400 Subject: [PATCH 26/83] 40: drop osbuild bootc container Signed-off-by: Paul Whalen --- fedora-iot.conf | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 1b28518..5e18630 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -236,19 +236,6 @@ osbuild = { "subvariant": "IoT", "manifest_type": "dvd-ostree", }, - { - "name": "%s-bootc" % release_name, - "distro": "fedora-40", - "image_types": ["iot-bootable-container"], - "target": "f%s-candidate" % release_version, - "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f40-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-provisioner" % release_name, "distro": "fedora-40", From 4735208cee8f965fb8075c7753dd24eb350cb180 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 3 May 2024 16:29:19 +0100 Subject: [PATCH 27/83] Add script to push containers to registries Add script to push containers to registries, run the script at the end of the compose process to push the container manifests to the fedora container registries. Signed-off-by: Peter Robinson --- sync-bootc-base-containers.sh | 177 ++++++++++++++++++++++++++++++++++ twoweek-nightly.sh | 2 + 2 files changed, 179 insertions(+) create mode 100755 sync-bootc-base-containers.sh diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh new file mode 100755 index 0000000..7e9b0e1 --- /dev/null +++ b/sync-bootc-base-containers.sh @@ -0,0 +1,177 @@ +#!/bin/bash + +set -x + +# +# Sync latest docker image +# +# Docs in the f_help function +f_ctrl_c() { + printf "\n*** Exiting ***\n" + exit $? +} +# trap int (ctrl-c) +trap f_ctrl_c SIGINT +f_help() { + cat < /dev/null + # Import the image + for arch in "${ARCHES[@]}"; do + local filename + filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${compose}.ociarchive" + copy_image ${format}:${filename} ${registry_name}:${release}-${arch} + done + + popd &> /dev/null + + generate_manifest_list ${registry_name} ${release} + printf "Removing temporary directory\n" + rm -rf $work_dir +} + +# +# Version should not be higher than rawhide +# Either there is a mistake or script is out of date +# +if [[ ${1} -gt "$current_rawhide" ]]; then + printf "ERROR: VERSION HIGHER THAN RAWHIDE" + exit 1 +fi + +# For fedora-bootc +if [[ -n ${base_build_nvr} ]]; then + find_and_copy_images ${base_build_nvr} fedora-bootc ${1} ${compose} +fi diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 4e28f65..990268a 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -69,6 +69,8 @@ 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 From bcd9757545109f97a7144a7663466e12286a8c0a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 8 May 2024 12:33:40 +0100 Subject: [PATCH 28/83] Improve container version detection process Some minor improvements around container version and release detection. Signed-off-by: Peter Robinson --- sync-bootc-base-containers.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 7e9b0e1..f2272f9 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -69,6 +69,7 @@ fi basename="Fedora-IoT-bootc" format="oci-archive" +vers=${1} compose=${2} compdate=`echo ${compose} | cut -c 4-` @@ -78,7 +79,7 @@ compdate=`echo ${compose} | cut -c 4-` # Can't currently query koji for runroot tasks as they're not tagged # # base_build_nvr=$(koji -q latest-build --type=image f${1}-updates-candidate ${basename} | awk '{print $1}') -base_build_nvr=${basename}-${compose} +base_build_nvr=${basename}-${vers}-${compdate} if [[ ${1} -eq "$current_stable" ]]; then tagname="latest" @@ -140,8 +141,8 @@ find_and_copy_images() { exit 1 fi # Check both architectures completed in the build else exit - if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/x86_64/images/${basename}-${compose}.ociarchive" ] && \ - [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/aarch64/images/${basename}-${compose}.ociarchive" ]; then + if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/x86_64/images/${basename}-${release}.${compdate}.ociarchive" ] && \ + [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/aarch64/images/${basename}-${release}.${compdate}.ociarchive" ]; then echo "One of the expected images are missing, exiting." exit 1 fi @@ -151,7 +152,7 @@ find_and_copy_images() { # Import the image for arch in "${ARCHES[@]}"; do local filename - filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${compose}.ociarchive" + filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive" copy_image ${format}:${filename} ${registry_name}:${release}-${arch} done @@ -171,7 +172,9 @@ if [[ ${1} -gt "$current_rawhide" ]]; then exit 1 fi +printf "Syncing compose contailers: ${vers} : ${compose}\n" + # For fedora-bootc if [[ -n ${base_build_nvr} ]]; then - find_and_copy_images ${base_build_nvr} fedora-bootc ${1} ${compose} + find_and_copy_images ${base_build_nvr} fedora-bootc ${vers} ${compose} fi From 0fda47c2ef7afbbb41aabd4006a656c33f4ff1a4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 3 May 2024 16:29:19 +0100 Subject: [PATCH 29/83] Add script to push containers to registries Add script to push containers to registries, run the script at the end of the compose process to push the container manifests to the fedora container registries. Signed-off-by: Peter Robinson --- sync-bootc-base-containers.sh | 177 ++++++++++++++++++++++++++++++++++ twoweek-nightly.sh | 2 + 2 files changed, 179 insertions(+) create mode 100755 sync-bootc-base-containers.sh diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh new file mode 100755 index 0000000..7e9b0e1 --- /dev/null +++ b/sync-bootc-base-containers.sh @@ -0,0 +1,177 @@ +#!/bin/bash + +set -x + +# +# Sync latest docker image +# +# Docs in the f_help function +f_ctrl_c() { + printf "\n*** Exiting ***\n" + exit $? +} +# trap int (ctrl-c) +trap f_ctrl_c SIGINT +f_help() { + cat < /dev/null + # Import the image + for arch in "${ARCHES[@]}"; do + local filename + filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${compose}.ociarchive" + copy_image ${format}:${filename} ${registry_name}:${release}-${arch} + done + + popd &> /dev/null + + generate_manifest_list ${registry_name} ${release} + printf "Removing temporary directory\n" + rm -rf $work_dir +} + +# +# Version should not be higher than rawhide +# Either there is a mistake or script is out of date +# +if [[ ${1} -gt "$current_rawhide" ]]; then + printf "ERROR: VERSION HIGHER THAN RAWHIDE" + exit 1 +fi + +# For fedora-bootc +if [[ -n ${base_build_nvr} ]]; then + find_and_copy_images ${base_build_nvr} fedora-bootc ${1} ${compose} +fi diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 95a15fd..12b3f82 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -69,6 +69,8 @@ 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 From f7a61386b47d93250d1efeac2ce7e7b2ee1de12f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 8 May 2024 12:33:40 +0100 Subject: [PATCH 30/83] Improve container version detection process Some minor improvements around container version and release detection. Signed-off-by: Peter Robinson --- sync-bootc-base-containers.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 7e9b0e1..f2272f9 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -69,6 +69,7 @@ fi basename="Fedora-IoT-bootc" format="oci-archive" +vers=${1} compose=${2} compdate=`echo ${compose} | cut -c 4-` @@ -78,7 +79,7 @@ compdate=`echo ${compose} | cut -c 4-` # Can't currently query koji for runroot tasks as they're not tagged # # base_build_nvr=$(koji -q latest-build --type=image f${1}-updates-candidate ${basename} | awk '{print $1}') -base_build_nvr=${basename}-${compose} +base_build_nvr=${basename}-${vers}-${compdate} if [[ ${1} -eq "$current_stable" ]]; then tagname="latest" @@ -140,8 +141,8 @@ find_and_copy_images() { exit 1 fi # Check both architectures completed in the build else exit - if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/x86_64/images/${basename}-${compose}.ociarchive" ] && \ - [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/aarch64/images/${basename}-${compose}.ociarchive" ]; then + if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/x86_64/images/${basename}-${release}.${compdate}.ociarchive" ] && \ + [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/aarch64/images/${basename}-${release}.${compdate}.ociarchive" ]; then echo "One of the expected images are missing, exiting." exit 1 fi @@ -151,7 +152,7 @@ find_and_copy_images() { # Import the image for arch in "${ARCHES[@]}"; do local filename - filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${compose}.ociarchive" + filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive" copy_image ${format}:${filename} ${registry_name}:${release}-${arch} done @@ -171,7 +172,9 @@ if [[ ${1} -gt "$current_rawhide" ]]; then exit 1 fi +printf "Syncing compose contailers: ${vers} : ${compose}\n" + # For fedora-bootc if [[ -n ${base_build_nvr} ]]; then - find_and_copy_images ${base_build_nvr} fedora-bootc ${1} ${compose} + find_and_copy_images ${base_build_nvr} fedora-bootc ${vers} ${compose} fi From ebf28f3e6c2bffc3c3f2cf572a03ef574d02920a Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 10 May 2024 13:00:47 -0400 Subject: [PATCH 31/83] f41: use fedora-bootc-rawhide.yaml Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 142ac9e..4eccecb 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -276,7 +276,7 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", - "treefile": "fedora-bootc.yaml", + "treefile": "fedora-bootc-rawhide.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], From ec0b009a9213f4c6ef712aeba104adda8e3eade6 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 10 May 2024 13:50:31 -0400 Subject: [PATCH 32/83] f41: add bootc tier0 target Signed-off-by: Paul Whalen --- fedora-iot.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 4eccecb..33c2a60 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -281,6 +281,15 @@ ostree_container = { "arches": ["x86_64", "aarch64"], "failable": ['*'], }, + "^bootc-tier0$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/fedora-iot/base-images", + "config_branch": "main", + "treefile": "fedora-tier-0-rawhide.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + }, } koji_profile = 'compose_koji' From 1e4adbb93e4f972b5cf09d349bd4eb62148efd14 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 13 May 2024 12:41:35 -0400 Subject: [PATCH 33/83] f41: add bootc-tier0 to variants Signed-off-by: Paul Whalen --- variants-fedora.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/variants-fedora.xml b/variants-fedora.xml index 058a67d..8a2da1f 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -12,5 +12,10 @@ aarch64 x86_64 + + + aarch64 + x86_64 + From 105c62d27b417ce795f6a49d5948165ae3d55f18 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 14 May 2024 12:28:01 -0400 Subject: [PATCH 34/83] f41: fix missing closure tag Signed-off-by: Paul Whalen --- variants-fedora.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/variants-fedora.xml b/variants-fedora.xml index 8a2da1f..c4f1d2f 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -12,6 +12,7 @@ aarch64 x86_64 + aarch64 From 396bf8ee8079b07ed20c854a6985a48fd1f64df4 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 21 May 2024 09:46:46 -0400 Subject: [PATCH 35/83] f41: add bootc-tier0 to tree_variants Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 33c2a60..89c1d87 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -22,7 +22,7 @@ sigkeys = ['e99d6ad1'] tree_arches = ['aarch64', 'x86_64'] # limit tree variants # if undefined, all variants from variants.xml will be included -tree_variants = ['IoT', 'bootc'] +tree_variants = ['IoT', 'bootc', 'bootc-tier0'] hashed_directories = True # RUNROOT settings From 17ebca480cb66afc3b5dab8ab34320ff75d95a01 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 4 Jun 2024 15:22:58 -0400 Subject: [PATCH 36/83] F41: Add manifest_type to simplified-provisioner Signed-off-by: Paul Whalen --- fedora-iot.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 89c1d87..ae5cb8c 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -246,6 +246,7 @@ osbuild = { "subvariant": "IoT", "customizations": {"installation_device": "/dev/vda"}, "failable": ["*"], + "manifest_type": "simplified-provisioner", }, ], } From dd421a451c44a019fdaa8e96deb97b265e5a262e Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 6 Jun 2024 15:34:13 -0400 Subject: [PATCH 37/83] Change simplified-provisioner to new subvariant Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index ae5cb8c..57a7192 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -243,10 +243,10 @@ osbuild = { "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/rawhide/$arch/iot", - "subvariant": "IoT", + "subvariant": "IoT_Simplified_Provisioner", "customizations": {"installation_device": "/dev/vda"}, "failable": ["*"], - "manifest_type": "simplified-provisioner", + "manifest_type": "dvd-ostree", }, ], } From e2585c1da4f0f0ef0756ad24ca0f078bf7940ab7 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 10 Jun 2024 15:34:55 -0400 Subject: [PATCH 38/83] Update bootc config names to match upstream Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 57a7192..d44a735 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -277,7 +277,7 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", - "treefile": "fedora-bootc-rawhide.yaml", + "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], @@ -286,7 +286,7 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", - "treefile": "fedora-tier-0-rawhide.yaml", + "treefile": "fedora-tier-0.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], From 6cae4ca9aa071882245c4d99fa77bf012299540e Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 10 Jun 2024 15:52:30 -0400 Subject: [PATCH 39/83] Update bootc branch to f40 Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 5e18630..a8cd2c8 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -278,7 +278,7 @@ 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": "f40", "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], From 1de421aca3cbe93fdacad846a9d96eeab57fef15 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 15 Jul 2024 13:13:55 -0400 Subject: [PATCH 40/83] F41: Add ppc64le and s390x to bootc images Signed-off-by: Paul Whalen --- fedora-iot.conf | 6 +++--- sync-bootc-base-containers.sh | 10 ++++++---- variants-fedora.xml | 4 ++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index d44a735..99c08de 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -19,7 +19,7 @@ sigkeys = ['e99d6ad1'] # limit tree architectures # if undefined, all architectures from variants.xml will be included -tree_arches = ['aarch64', 'x86_64'] +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-tier0'] @@ -279,7 +279,7 @@ ostree_container = { "config_branch": "main", "treefile": "fedora-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], - "arches": ["x86_64", "aarch64"], + "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], }, "^bootc-tier0$": { @@ -288,7 +288,7 @@ ostree_container = { "config_branch": "main", "treefile": "fedora-tier-0.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], - "arches": ["x86_64", "aarch64"], + "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], }, } diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index f2272f9..d5a65d2 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -33,7 +33,7 @@ EXAMPLE EOF } -ARCHES=("aarch64" "x86_64") +ARCHES=("aarch64" "x86_64" "ppc64le" "s390x") arch_to_goarch() { local a=$1; shift @@ -41,6 +41,8 @@ arch_to_goarch() { case "$a" in aarch64) echo arm64 ;; x86_64) echo amd64 ;; + ppc64le) echo ppc64le ;; + s390x) echo s390x ;; *) echo $a ;; esac } @@ -140,9 +142,9 @@ find_and_copy_images() { printf "Unexpected image type! If we added a new one, it needs mapping here" exit 1 fi - # Check both architectures completed in the build else exit - if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/x86_64/images/${basename}-${release}.${compdate}.ociarchive" ] && \ - [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/aarch64/images/${basename}-${release}.${compdate}.ociarchive" ]; then + # Check that all architectures completed in the build else exit + for arch in "${ARCHES[@]}"; do + if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive" ]; then echo "One of the expected images are missing, exiting." exit 1 fi diff --git a/variants-fedora.xml b/variants-fedora.xml index c4f1d2f..462c3ea 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -11,12 +11,16 @@ aarch64 x86_64 + ppc64le + s390x aarch64 x86_64 + ppc64le + s390x From a8288fa657f97df422af7d106d66f140d906968e Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 16 Jul 2024 15:31:48 -0400 Subject: [PATCH 41/83] F41: fix loop in sync script Signed-off-by: Paul Whalen --- sync-bootc-base-containers.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index d5a65d2..da29480 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -144,10 +144,11 @@ find_and_copy_images() { fi # Check that all architectures completed in the build else exit for arch in "${ARCHES[@]}"; do - if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive" ]; then - echo "One of the expected images are missing, exiting." - exit 1 - fi + if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive" ]; then + echo "One of the expected images are missing, exiting." + exit 1 + fi + done work_dir=$(mktemp -d) pushd ${work_dir} &> /dev/null From bff3d8261db7ad59f3f24c9719ce96fa427d8353 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 12 Aug 2024 14:11:08 -0400 Subject: [PATCH 42/83] Rawhide is now Fedora 42 Signed-off-by: Paul Whalen --- fedora-iot.conf | 24 ++++++++++++------------ nightly.sh | 6 +++--- sync-release.sh | 8 ++++---- twoweek-nightly.sh | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 99c08de..cfa2b1f 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,9 +1,9 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '41' +release_version = '42' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f41 runs. +# and OSTree installer we'll use inputs from other f42 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] # GENERAL SETTINGS @@ -11,11 +11,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f41.xml', - 'command': 'make comps-f41.xml' + 'file': 'comps-f42.xml', + 'command': 'make comps-f42.xml' } variants_file='variants-fedora.xml' -sigkeys = ['e99d6ad1'] +sigkeys = ['105ef944'] # 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 = 'f41-build' +runroot_tag = 'f42-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f41-iot' +pkgset_koji_tag = 'f42-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -205,15 +205,15 @@ 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_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '41' +global_version = '42' # live_images ignores this in favor of live_target -global_target = 'f41' +global_target = 'f42' osbuild = { "^IoT$": [ { "name": "%s-raw" % release_name, - "distro": "fedora-41", + "distro": "fedora-42", "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -224,7 +224,7 @@ osbuild = { }, { "name": "%s-ostree" % release_name, - "distro": "fedora-41", + "distro": "fedora-42", "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -236,7 +236,7 @@ osbuild = { }, { "name": "%s-provisioner" % release_name, - "distro": "fedora-41", + "distro": "fedora-42", "image_types": ["iot-simplified-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], diff --git a/nightly.sh b/nightly.sh index e42e037..a6675b7 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="41" -RELEASE_TITLE="41" -COMPSFILE="comps-f41.xml" +RELEASE="42" +RELEASE_TITLE="42" +COMPSFILE="comps-f42.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " diff --git a/sync-release.sh b/sync-release.sh index b2b7276..1ad1bfe 100755 --- a/sync-release.sh +++ b/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="41" -RELEASE_TITLE="41" -COMPSFILE="comps-f41.xml" +RELEASE="42" +RELEASE_TITLE="42" +COMPSFILE="comps-f42.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/41/" +RSYNCTARGET="/pub/alt/iot/42/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 990268a..7d8d312 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="41" -RELEASE_TITLE="41" -COMPSFILE="comps-f41.xml" +RELEASE="42" +RELEASE_TITLE="42" +COMPSFILE="comps-f42.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " From 146a5e1e4b57017eae2234fe5eaebb5143635b2c Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 16 Aug 2024 12:53:22 -0400 Subject: [PATCH 43/83] F42: Update sync-script for f42 Signed-off-by: Paul Whalen --- sync-bootc-base-containers.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index da29480..f476e76 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -51,7 +51,7 @@ arch_to_goarch() { # need to move the fedora:latest tag current_stable="40" # Define what is rawhide so we know to push that tag -current_rawhide="41" +current_rawhide="42" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then @@ -89,6 +89,7 @@ fi if [[ ${1} -eq "$current_rawhide" ]]; then tagname="rawhide" fi + if [[ -z "$stage" ]]; then registries=("registry.fedoraproject.org" "candidate-registry.fedoraproject.org" "quay.io/fedora") else From d5565f5bfe90166c79b5898b529d1dc878201bd1 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 23 Sep 2024 15:43:10 -0400 Subject: [PATCH 44/83] F42: Add iot base bootc image Signed-off-by: Paul Whalen --- fedora-iot.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index cfa2b1f..b248af4 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -291,6 +291,15 @@ ostree_container = { "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], }, + "^bootc-base$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_branch": "main", + "treefile": "fedora-iot-bootc.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + }, } koji_profile = 'compose_koji' From 43008ac60cabedacfe2312278f05f7a78809ecb2 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 25 Sep 2024 18:04:06 -0400 Subject: [PATCH 45/83] Update variants to include the bootc-base Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 +- variants-fedora.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index b248af4..5ceb39c 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-tier0'] +tree_variants = ['IoT', 'bootc', 'bootc-tier0', 'bootc-base'] hashed_directories = True # RUNROOT settings diff --git a/variants-fedora.xml b/variants-fedora.xml index 462c3ea..0568bf8 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -7,6 +7,12 @@ x86_64 + + + aarch64 + x86_64 + + aarch64 From 67a5ddec2419034bb1592212490be6182bbebe6f Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 3 Oct 2024 13:48:39 -0400 Subject: [PATCH 46/83] F42: Add iot base bootc image to sync script Signed-off-by: Paul Whalen --- sync-bootc-base-containers.sh | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index f476e76..d232192 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -33,8 +33,6 @@ EXAMPLE EOF } -ARCHES=("aarch64" "x86_64" "ppc64le" "s390x") - arch_to_goarch() { local a=$1; shift # See https://github.com/coreos/stream-metadata-go/blob/c5fe1b98ac1b1e6ab62a606b7580dc1f30703f83/arch/arch.go#L14 @@ -69,7 +67,7 @@ if [[ "${3}" == "-s" ]]; then stage="true" fi -basename="Fedora-IoT-bootc" +BASENAMES=("Fedora-IoT-bootc" "Fedora-IoT-bootc-base") format="oci-archive" vers=${1} compose=${2} @@ -81,7 +79,6 @@ compdate=`echo ${compose} | cut -c 4-` # Can't currently query koji for runroot tasks as they're not tagged # # base_build_nvr=$(koji -q latest-build --type=image f${1}-updates-candidate ${basename} | awk '{print $1}') -base_build_nvr=${basename}-${vers}-${compdate} if [[ ${1} -eq "$current_stable" ]]; then tagname="latest" @@ -137,7 +134,7 @@ find_and_copy_images() { local registry_name=$2 local release=$3 local name - if [[ ${registry_name} = "fedora-bootc" ]]; then + if [[ ${registry_name} = "fedora-bootc" ]] || [[ ${registry_name} = "fedora-iot" ]]; then name=${basename} else printf "Unexpected image type! If we added a new one, it needs mapping here" @@ -145,7 +142,7 @@ find_and_copy_images() { fi # Check that all architectures completed in the build else exit for arch in "${ARCHES[@]}"; do - if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive" ]; then + if [ ! -f "/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/${compose_type}/${arch}/images/${basename}-${release}.${compdate}.ociarchive" ]; then echo "One of the expected images are missing, exiting." exit 1 fi @@ -156,7 +153,7 @@ find_and_copy_images() { # Import the image for arch in "${ARCHES[@]}"; do local filename - filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/bootc/${arch}/images/${basename}-${release}.${compdate}.ociarchive" + filename="/mnt/koji/compose/iot/Fedora-IoT-${release}-${compdate}/compose/${compose_type}/${arch}/images/${basename}-${release}.${compdate}.ociarchive" copy_image ${format}:${filename} ${registry_name}:${release}-${arch} done @@ -178,7 +175,19 @@ fi printf "Syncing compose contailers: ${vers} : ${compose}\n" -# For fedora-bootc -if [[ -n ${base_build_nvr} ]]; then - find_and_copy_images ${base_build_nvr} fedora-bootc ${vers} ${compose} -fi +# For fedora-bootc and fedora-iot +for basename in "${BASENAMES[@]}"; do + if [[ ${basename} = "Fedora-IoT-bootc" ]]; then + registry_name="fedora-bootc" + compose_type="bootc" + ARCHES=("aarch64" "x86_64" "ppc64le" "s390x") + elif [[ ${basename} = "Fedora-IoT-bootc-base" ]]; then + registry_name="fedora-iot" + compose_type="bootc-base" + ARCHES=("aarch64" "x86_64") + fi + base_build_nvr=${basename}-${vers}-${compdate} + if [[ -n ${base_build_nvr} ]]; then + find_and_copy_images ${base_build_nvr} ${registry_name} ${vers} ${compose} + fi +done From 702da4a01d9ef39bbdf3cfe5b6456aafb8a73e4f Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 4 Oct 2024 10:38:07 -0400 Subject: [PATCH 47/83] F42: drop tier-0 from the compose Signed-off-by: Paul Whalen --- fedora-iot.conf | 11 +---------- variants-fedora.xml | 8 -------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 5ceb39c..11457e3 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-tier0', 'bootc-base'] +tree_variants = ['IoT', 'bootc', 'bootc-base'] hashed_directories = True # RUNROOT settings @@ -282,15 +282,6 @@ ostree_container = { "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], }, - "^bootc-tier0$": { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/base-images", - "config_branch": "main", - "treefile": "fedora-tier-0.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/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/ostree.git", diff --git a/variants-fedora.xml b/variants-fedora.xml index 0568bf8..9deb115 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -21,12 +21,4 @@ s390x - - - aarch64 - x86_64 - ppc64le - s390x - - From 9fed822cc19acb6e6a719eefc6e3400deec64246 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 7 Oct 2024 19:02:35 -0700 Subject: [PATCH 48/83] Build bootc images in IoT variant, tweak IoT image's subvariant As discussed in https://pagure.io/fedora-infra/ansible/pull-request/2295 , this subvariant is more usable and in line with previous practice. It will make life a bit easier for fedora-image-uploader. This also tweaks the config to build both ostree container images in the IoT variant and give them explicit subvariants, instead of building them in their own variants and relying on the variant to be inherited as the subvariant definition too. This just seems a bit cleaner and avoids these variants showing up in the metadata, which reads a bit oddly. Signed-off-by: Adam Williamson --- fedora-iot.conf | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 11457e3..fd349ca 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 @@ -273,24 +273,28 @@ 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-bootc.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/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/ostree.git", - "config_branch": "main", - "treefile": "fedora-iot-bootc.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/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-bootc.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], + "failable": ['*'], + "subvariant": "bootc", + }, + { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_branch": "main", + "treefile": "fedora-iot-bootc.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + "subvariant": "IoT_bootc_base", + }, + ] } koji_profile = 'compose_koji' From 0b466a659dd723e1561b080c218bf1a8cf3c7c37 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 8 Oct 2024 13:44:52 -0400 Subject: [PATCH 49/83] Revert "Build bootc images in IoT variant, tweak IoT image's subvariant" This reverts commit 9fed822cc19acb6e6a719eefc6e3400deec64246. --- fedora-iot.conf | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index fd349ca..11457e3 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'] +tree_variants = ['IoT', 'bootc', 'bootc-base'] hashed_directories = True # RUNROOT settings @@ -273,28 +273,24 @@ ostree = { } 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-bootc.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], - "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], - "failable": ['*'], - "subvariant": "bootc", - }, - { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", - "treefile": "fedora-iot-bootc.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], - "arches": ["x86_64", "aarch64"], - "failable": ['*'], - "subvariant": "IoT_bootc_base", - }, - ] + "^bootc$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "config_url": "https://pagure.io/fedora-iot/base-images", + "config_branch": "main", + "treefile": "fedora-bootc.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/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/ostree.git", + "config_branch": "main", + "treefile": "fedora-iot-bootc.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + }, } koji_profile = 'compose_koji' From 6ae099cb81cb5eaec69137d3c6dbcfd2ee3df370 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 8 Oct 2024 14:10:25 -0400 Subject: [PATCH 50/83] F42: update basename for IoT container Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- sync-bootc-base-containers.sh | 4 ++-- variants-fedora.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 11457e3..c7ead3d 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', 'bootc', 'IoT_bootc_base'] hashed_directories = True # RUNROOT settings @@ -282,7 +282,7 @@ ostree_container = { "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], }, - "^bootc-base$": { + "^IoT_bootc_base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "main", diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index d232192..b69dabf 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -67,7 +67,7 @@ if [[ "${3}" == "-s" ]]; then stage="true" fi -BASENAMES=("Fedora-IoT-bootc" "Fedora-IoT-bootc-base") +BASENAMES=("Fedora-IoT-bootc" "Fedora-IoT-IoT_bootc_base") format="oci-archive" vers=${1} compose=${2} @@ -181,7 +181,7 @@ for basename in "${BASENAMES[@]}"; do registry_name="fedora-bootc" compose_type="bootc" ARCHES=("aarch64" "x86_64" "ppc64le" "s390x") - elif [[ ${basename} = "Fedora-IoT-bootc-base" ]]; then + elif [[ ${basename} = "Fedora-IoT-IoT_bootc_base" ]]; then registry_name="fedora-iot" compose_type="bootc-base" ARCHES=("aarch64" "x86_64") diff --git a/variants-fedora.xml b/variants-fedora.xml index 9deb115..041f3ba 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -7,7 +7,7 @@ x86_64 - + aarch64 x86_64 From 950193a148ca4a2cf25792d0943d68635d51edf0 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 8 Oct 2024 14:55:56 -0400 Subject: [PATCH 51/83] Revert "F42: update basename for IoT container" This reverts commit 6ae099cb81cb5eaec69137d3c6dbcfd2ee3df370. --- fedora-iot.conf | 4 ++-- sync-bootc-base-containers.sh | 4 ++-- variants-fedora.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index c7ead3d..11457e3 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', 'IoT_bootc_base'] +tree_variants = ['IoT', 'bootc', 'bootc-base'] hashed_directories = True # RUNROOT settings @@ -282,7 +282,7 @@ ostree_container = { "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], }, - "^IoT_bootc_base$": { + "^bootc-base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "main", diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index b69dabf..d232192 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -67,7 +67,7 @@ if [[ "${3}" == "-s" ]]; then stage="true" fi -BASENAMES=("Fedora-IoT-bootc" "Fedora-IoT-IoT_bootc_base") +BASENAMES=("Fedora-IoT-bootc" "Fedora-IoT-bootc-base") format="oci-archive" vers=${1} compose=${2} @@ -181,7 +181,7 @@ for basename in "${BASENAMES[@]}"; do registry_name="fedora-bootc" compose_type="bootc" ARCHES=("aarch64" "x86_64" "ppc64le" "s390x") - elif [[ ${basename} = "Fedora-IoT-IoT_bootc_base" ]]; then + elif [[ ${basename} = "Fedora-IoT-bootc-base" ]]; then registry_name="fedora-iot" compose_type="bootc-base" ARCHES=("aarch64" "x86_64") diff --git a/variants-fedora.xml b/variants-fedora.xml index 041f3ba..9deb115 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -7,7 +7,7 @@ x86_64 - + aarch64 x86_64 From 71f65004d89abd08ff5674d85370363332130f7c Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 8 Oct 2024 16:29:07 -0400 Subject: [PATCH 52/83] F42: use subvariant with bootc containers 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 11457e3..37300e6 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -281,6 +281,7 @@ ostree_container = { "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], + "subvariant": "bootc", }, "^bootc-base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", @@ -290,6 +291,7 @@ ostree_container = { "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], + "subvariant": "IoT_bootc_base", }, } From 0f6c882858b5dd2ee1fafee0746fb2deea6d31f6 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 9 Oct 2024 10:40:52 -0400 Subject: [PATCH 53/83] Revert "F42: use subvariant with bootc containers" This reverts commit 71f65004d89abd08ff5674d85370363332130f7c. --- fedora-iot.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 37300e6..11457e3 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -281,7 +281,6 @@ ostree_container = { "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], - "subvariant": "bootc", }, "^bootc-base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", @@ -291,7 +290,6 @@ ostree_container = { "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], - "subvariant": "IoT_bootc_base", }, } From c1107d53902f70f4e43a5d8262d5ad4012488efb Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 23 Oct 2024 15:31:01 -0400 Subject: [PATCH 54/83] pungi: update treefile to use for rawhide fedora-bootc As discussed in https://gitlab.com/fedora/bootc/tracker/-/issues/39, we will be maintaining all Fedora versions in the `main` branch going forward. The `fedora-bootc.yaml` file upstream is now version-less. To not break pungi, we need it to use the stub treefile we added that sets the releasever to rawhide. --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 11457e3..aa60ed4 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -277,7 +277,7 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "main", - "treefile": "fedora-bootc.yaml", + "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": ['*'], From 2dcee7e4b153658ea6c3cb0830a064f9b317eba0 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 4 Nov 2024 16:36:27 -0500 Subject: [PATCH 55/83] F42: Update iot base image to use base-images mirror and tier-x Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index aa60ed4..a864c54 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -284,9 +284,9 @@ ostree_container = { }, "^bootc-base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", "config_branch": "main", - "treefile": "fedora-iot-bootc.yaml", + "treefile": "fedora-iot-rawhide.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], From faee0e8c9dde309a7a858d37b7d539cca09b50d2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 5 Nov 2024 07:49:29 -0800 Subject: [PATCH 56/83] sync-bootc-base-containers: 41 is now current Signed-off-by: Adam Williamson --- sync-bootc-base-containers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index d232192..ee24432 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="40" +current_stable="41" # Define what is rawhide so we know to push that tag current_rawhide="42" # Sanity checking From 065867da2e7fb2d49093f1926dd3cdcaccd01e4a Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 5 Nov 2024 16:30:22 -0500 Subject: [PATCH 57/83] Revert F42: Update iot base image to use base-images mirror and tier-x Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a864c54..aa60ed4 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -284,9 +284,9 @@ ostree_container = { }, "^bootc-base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", + "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "main", - "treefile": "fedora-iot-rawhide.yaml", + "treefile": "fedora-iot-bootc.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], From 5457ba1b6bacb58fd85e02df92ebdb93273679e1 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 15 Nov 2024 13:12:03 -0500 Subject: [PATCH 58/83] F42: Update iot base image to use base-images mirror and tier-x Signed-off-by: Paul Whalen --- fedora-iot.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index aa60ed4..a864c54 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -284,9 +284,9 @@ ostree_container = { }, "^bootc-base$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", "config_branch": "main", - "treefile": "fedora-iot-bootc.yaml", + "treefile": "fedora-iot-rawhide.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], From da2cab94ecea788ac2b39c05e943f412b2e188c6 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 18 Nov 2024 16:24:51 -0500 Subject: [PATCH 59/83] Remove IoT, only compose fedora-bootc container Signed-off-by: Paul Whalen --- fedora-iot.conf | 74 +---------------------------------- sync-bootc-base-containers.sh | 4 +- 2 files changed, 3 insertions(+), 75 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a8cd2c8..dc50b18 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -22,7 +22,7 @@ sigkeys = ['a15B79cc'] tree_arches = ['aarch64', 'x86_64'] # limit tree variants # if undefined, all variants from variants.xml will be included -tree_variants = ['IoT', 'bootc'] +tree_variants = ['bootc'] hashed_directories = True # RUNROOT settings @@ -87,13 +87,6 @@ lorax_options = [ }) ] -additional_packages = [ - ('^IoT$$', { - '*': [ - '*', - ], - }), -] multilib = [ ('^Everything$', { 'x86_64': ['devel', 'runtime'], @@ -209,71 +202,6 @@ global_version = '40' # live_images ignores this in favor of live_target global_target = 'f40' -osbuild = { - "^IoT$": [ - { - "name": "%s-raw" % release_name, - "distro": "fedora-40", - "image_types": ["iot-raw-image"], - "target": "f%s-candidate" % release_version, - "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/stable/$arch/iot", - "subvariant": "IoT", - }, - { - "name": "%s-ostree" % release_name, - "distro": "fedora-40", - "image_types": ["iot-installer"], - "target": "f%s-candidate" % release_version, - "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/stable/$arch/iot", - "subvariant": "IoT", - "manifest_type": "dvd-ostree", - }, - { - "name": "%s-provisioner" % release_name, - "distro": "fedora-40", - "image_types": ["iot-simplified-installer"], - "target": "f%s-candidate" % release_version, - "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/stable/$arch/iot", - "subvariant": "IoT", - "customizations": {"installation_device": "/dev/vda"}, - "failable": ["*"], - }, - ], -} - -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": "f40", - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f40-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 = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index f2272f9..5417d10 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="40" +current_stable="41" # Define what is rawhide so we know to push that tag -current_rawhide="41" +current_rawhide="42" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then From 606ff924e12e929f72fd86ab5e1f0cb438b22748 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 22 Nov 2024 14:32:23 -0500 Subject: [PATCH 60/83] F42: Temporarily make all deliverables failable 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 a864c54..6fab147 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/rawhide/$arch/iot", "subvariant": "IoT", + "failable": ["*"], }, { "name": "%s-ostree" % release_name, @@ -233,6 +234,7 @@ osbuild = { "ostree_ref": "fedora/rawhide/$arch/iot", "subvariant": "IoT", "manifest_type": "dvd-ostree", + "failable": ["*"], }, { "name": "%s-provisioner" % release_name, From 1bc946b6bb7e8cbd9ed02a5f3274e6ad5182b66b Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 25 Nov 2024 16:43:20 -0500 Subject: [PATCH 61/83] F40: Use versioned conf for bootc images Signed-off-by: Paul Whalen --- fedora-iot.conf => fedora-bootc.conf | 2 +- twoweek-nightly.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename fedora-iot.conf => fedora-bootc.conf (99%) diff --git a/fedora-iot.conf b/fedora-bootc.conf similarity index 99% rename from fedora-iot.conf rename to fedora-bootc.conf index dc50b18..8f19cab 100644 --- a/fedora-iot.conf +++ b/fedora-bootc.conf @@ -207,7 +207,7 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "f40", - "treefile": "fedora-bootc.yaml", + "treefile": "fedora-40.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 12b3f82..aad20f8 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -4,7 +4,7 @@ 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" +CONFIG="fedora-bootc.conf" TARGET_DIR="/mnt/koji/compose/iot" NIGHTLY="" DEST=$(pwd) From ec6291028cc7478c9ffc9dc3c9704bae145a771e Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 26 Nov 2024 09:51:23 -0500 Subject: [PATCH 62/83] F40: Remove unused sections of the twoweek-nightly.sh script Signed-off-by: Paul Whalen --- twoweek-nightly.sh | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index aad20f8..2452ee1 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -47,38 +47,6 @@ time $CMD "$@" if [ "$?" != "0" ]; then exit 1 fi -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" - -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 # 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' -#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 {} \; From 583d9635543fba52417837d0d1ed894007f4c43b Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 26 Nov 2024 15:26:56 -0500 Subject: [PATCH 63/83] F40: Update base-images to use main Signed-off-by: Paul Whalen --- fedora-bootc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-bootc.conf b/fedora-bootc.conf index 8f19cab..75bb9f5 100644 --- a/fedora-bootc.conf +++ b/fedora-bootc.conf @@ -206,7 +206,7 @@ ostree_container = { "^bootc$": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://pagure.io/fedora-iot/base-images", - "config_branch": "f40", + "config_branch": "main", "treefile": "fedora-40.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], From 726ab13a4862453631e80d4872a3f16294c5df2c Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 13 Jan 2025 11:33:26 -0500 Subject: [PATCH 64/83] F42: revert Temporarily make all deliverables failable Signed-off-by: Paul Whalen --- fedora-iot.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 6fab147..a864c54 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -221,7 +221,6 @@ osbuild = { "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/rawhide/$arch/iot", "subvariant": "IoT", - "failable": ["*"], }, { "name": "%s-ostree" % release_name, @@ -234,7 +233,6 @@ osbuild = { "ostree_ref": "fedora/rawhide/$arch/iot", "subvariant": "IoT", "manifest_type": "dvd-ostree", - "failable": ["*"], }, { "name": "%s-provisioner" % release_name, From 2b7d52ea42aece7c7fe47746aee98f3e38be5745 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 4 Feb 2025 15:51:46 -0500 Subject: [PATCH 65/83] Rawhide is now Fedora 43 Signed-off-by: Paul Whalen --- fedora-iot.conf | 24 ++++++++++++------------ nightly.sh | 6 +++--- sync-bootc-base-containers.sh | 2 +- sync-release.sh | 8 ++++---- twoweek-nightly.sh | 6 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a864c54..4827cef 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,9 +1,9 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '42' +release_version = '43' # 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 f43 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] # GENERAL SETTINGS @@ -11,11 +11,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f42.xml', - 'command': 'make comps-f42.xml' + 'file': 'comps-f43.xml', + 'command': 'make comps-f43.xml' } variants_file='variants-fedora.xml' -sigkeys = ['105ef944'] +sigkeys = ['31645531'] # 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 = 'f43-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 = 'f43-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -205,15 +205,15 @@ 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_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '42' +global_version = '43' # live_images ignores this in favor of live_target -global_target = 'f42' +global_target = 'f43' osbuild = { "^IoT$": [ { "name": "%s-raw" % release_name, - "distro": "fedora-42", + "distro": "fedora-43", "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -224,7 +224,7 @@ osbuild = { }, { "name": "%s-ostree" % release_name, - "distro": "fedora-42", + "distro": "fedora-43", "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], @@ -236,7 +236,7 @@ osbuild = { }, { "name": "%s-provisioner" % release_name, - "distro": "fedora-42", + "distro": "fedora-43", "image_types": ["iot-simplified-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], diff --git a/nightly.sh b/nightly.sh index a6675b7..343e11e 100755 --- a/nightly.sh +++ b/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="43" +RELEASE_TITLE="43" +COMPSFILE="comps-f43.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " 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/sync-release.sh b/sync-release.sh index 1ad1bfe..0999c92 100755 --- a/sync-release.sh +++ b/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="43" +RELEASE_TITLE="43" +COMPSFILE="comps-f43.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/42/" +RSYNCTARGET="/pub/alt/iot/43/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 7d8d312..8094fd8 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ 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="43" +RELEASE_TITLE="43" +COMPSFILE="comps-f43.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " From 69aa8633db787b80515872648f279d139ba8e531 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 6 Feb 2025 11:23:44 -0500 Subject: [PATCH 66/83] Make Osbuild deliverables failable again due to ongoing network issues in Koji. 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 4827cef..6084310 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/rawhide/$arch/iot", "subvariant": "IoT", + "failable": ["*"], }, { "name": "%s-ostree" % release_name, @@ -233,6 +234,7 @@ osbuild = { "ostree_ref": "fedora/rawhide/$arch/iot", "subvariant": "IoT", "manifest_type": "dvd-ostree", + "failable": ["*"], }, { "name": "%s-provisioner" % release_name, From 3e2dd8f1a3d2e81968bae546f29bdf8a49a6bbd2 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 3 Mar 2025 11:17:00 -0500 Subject: [PATCH 67/83] Move fedora-bootc image to f41-stable branch See: https://pagure.io/fedora-iot/pungi-iot/issue/128 Signed-off-by: Paul Whalen --- fedora-bootc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-bootc.conf b/fedora-bootc.conf index 75bb9f5..5fd9781 100644 --- a/fedora-bootc.conf +++ b/fedora-bootc.conf @@ -206,7 +206,7 @@ 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": "f41-stable", "treefile": "fedora-40.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], From 0d7e74fa4a2c08cefb615343cf1c1328dabd5e03 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 27 Mar 2025 09:14:42 -0400 Subject: [PATCH 68/83] Update f40 release url to use master mirror The Fedora 40 release directory has been cleaned up and no longer available, use the master mirror to fix failing fedora-bootc images. Signed-off-by: Paul Whalen --- fedora-bootc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-bootc.conf b/fedora-bootc.conf index 5fd9781..ad14516 100644 --- a/fedora-bootc.conf +++ b/fedora-bootc.conf @@ -208,7 +208,7 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "f41-stable", "treefile": "fedora-40.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", + "repo": ["https://dl.fedoraproject.org/pub/fedora/linux/releases/40/Everything/$basearch/os/", "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], From 08b86c0759bb64a59554b9cdce2b3306f0fa4533 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Sat, 29 Mar 2025 10:12:53 -0400 Subject: [PATCH 69/83] Revert "Update f40 release url to use master mirror" This reverts commit 0d7e74fa4a2c08cefb615343cf1c1328dabd5e03. --- fedora-bootc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-bootc.conf b/fedora-bootc.conf index ad14516..5fd9781 100644 --- a/fedora-bootc.conf +++ b/fedora-bootc.conf @@ -208,7 +208,7 @@ ostree_container = { "config_url": "https://pagure.io/fedora-iot/base-images", "config_branch": "f41-stable", "treefile": "fedora-40.yaml", - "repo": ["https://dl.fedoraproject.org/pub/fedora/linux/releases/40/Everything/$basearch/os/", + "repo": ["https://kojipkgs.fedoraproject.org/compose/40/Fedora-40-20240414.0/compose/Everything/$basearch/os/", "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], From 2f94f34e05dab4a08ed96c440c0e906488fcb005 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 7 Oct 2024 19:02:35 -0700 Subject: [PATCH 70/83] Build bootc images in IoT variant, tweak subvariants and names There's substantial history here, including https://pagure.io/fedora-infra/ansible/pull-request/2295 and the discussion in the PR for this commit - https://pagure.io/fedora-iot/pungi-iot/pull-request/102 . This is trying to make the metadata for these images accurate and informative. With this change, the variant for both images will be "IoT" and they will both appear in the IoT directory in the tree. The IoT image's subvariant will also be "IoT". The base image's subvariant will be "base". The format for both images will be "ociarchive", as it currently is. From tomorrow, the type for both images will be "bootable-container". The filename for the IoT image will start with "Fedora-IoT-bootc", and the filename for the base image will start with "Fedora-base-bootc". So we will have these basename - subvariant - type - formats: * Fedora-IoT-bootc - IoT - bootable-container - ociarchive * Fedora-base-bootc - base - bootable-container - ociarchive The base image can easily be moved into the main compose and maintain the same filename base, subvariant, type and format. It would have a different variant in that case, but in practice we do not use the variant for image identification purposes much anyway. Signed-off-by: Adam Williamson --- fedora-iot.conf | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 6084310..8deb7bc 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -22,7 +22,7 @@ sigkeys = ['31645531'] 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 @@ -275,24 +275,29 @@ 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-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/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-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/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-rawhide.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/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-rawhide.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "arches": ["x86_64", "aarch64"], + "failable": ['*'], + "subvariant": "base", + "name": "Fedora-base-bootc", + }, + ] } koji_profile = 'compose_koji' From 8be1b6f560606558ffeedead69f05249c9b36fd8 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 24 Apr 2025 12:27:25 -0400 Subject: [PATCH 71/83] Add s390x and ppc64le to iot variant to produce bootc containers The generic bootc container was added to the IoT section of the compose, since then s390x and ppc64le have started to fail. This adds those arches to the IoT section in variant.xml and removes the old variants. Signed-off-by: Paul Whalen --- variants-fedora.xml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/variants-fedora.xml b/variants-fedora.xml index 9deb115..01f5f57 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -4,21 +4,9 @@ aarch64 - x86_64 - - - - - aarch64 - x86_64 - - - - - aarch64 - x86_64 - ppc64le - s390x + x86_64 + ppc64le + s390x From 9d606b1a54e109587f040da7677df400f089ea52 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 25 Apr 2025 17:04:40 -0400 Subject: [PATCH 72/83] 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 8deb7bc..6b5118d 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -284,7 +284,8 @@ ostree_container = { "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/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", @@ -294,8 +295,7 @@ ostree_container = { "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], - "subvariant": "base", - "name": "Fedora-base-bootc", + "name": "Fedora-IoT-bootc", }, ] } From 8e996a1358fcf77fc520c873e9301fd7c3d1e420 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 28 Apr 2025 16:48:45 -0400 Subject: [PATCH 73/83] F40: Fix container names and stop running the container sync script This fixes the container name of the generic bootc image and aligns all branches. We no longer need to run the sync script for the containers Signed-off-by: Paul Whalen --- fedora-bootc.conf | 2 ++ twoweek-nightly.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora-bootc.conf b/fedora-bootc.conf index 5fd9781..743699f 100644 --- a/fedora-bootc.conf +++ b/fedora-bootc.conf @@ -212,6 +212,8 @@ ostree_container = { "https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], + "subvariant": "base", + "name": "Fedora-base-bootc", }, } diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 2452ee1..63e3784 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -49,4 +49,4 @@ if [ "$?" != "0" ]; then fi # Push containers -./sync-bootc-base-containers.sh ${RELEASE} ${LABEL} +#./sync-bootc-base-containers.sh ${RELEASE} ${LABEL} From f968bf20e9c8c72224123b979e6e99e6b034c68d Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 29 Apr 2025 09:31:03 -0400 Subject: [PATCH 74/83] 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 8094fd8..560183d 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 f59060737228432f4502b8853667de3775f35f54 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 6 Aug 2025 16:44:55 -0400 Subject: [PATCH 75/83] Update F43 to use new pungi imagebuilder configuration option See: https://fedoraproject.org/wiki/Changes/KojiLocalImageBuilder Signed-off-by: Paul Whalen --- fedora-iot.conf | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 6b5118d..dc73fbe 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -209,44 +209,49 @@ global_version = '43' # live_images ignores this in favor of live_target global_target = 'f43' -osbuild = { +imagebuilder_target = 'f43-image-builder' +imagebuilder = { "^IoT$": [ { "name": "%s-raw" % release_name, - "distro": "fedora-43", - "image_types": ["iot-raw-image"], - "target": "f%s-candidate" % release_version, + "types": ["iot-raw-xz"], "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/rawhide/$arch/iot", + "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, - "distro": "fedora-43", - "image_types": ["iot-installer"], - "target": "f%s-candidate" % release_version, + "types": ["iot-installer"], "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/rawhide/$arch/iot", + "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, - "distro": "fedora-43", - "image_types": ["iot-simplified-installer"], - "target": "f%s-candidate" % release_version, + "types": ["iot-simplified-installer"], "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], - "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_ref": "fedora/rawhide/$arch/iot", + "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", - "customizations": {"installation_device": "/dev/vda"}, "failable": ["*"], "manifest_type": "dvd-ostree", }, From d23774204c6b7740a664a047eb48c95b26e4a6ef Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 12 Aug 2025 09:28:34 -0400 Subject: [PATCH 76/83] F-44: Update for branching Signed-off-by: Paul Whalen --- fedora-iot.conf | 20 ++++++++++---------- nightly.sh | 6 +++--- sync-release.sh | 8 ++++---- twoweek-nightly.sh | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index dc73fbe..9cda9d0 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,9 +1,9 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '43' +release_version = '44' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f43 runs. +# and OSTree installer we'll use inputs from other f44 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] # GENERAL SETTINGS @@ -11,11 +11,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f43.xml', - 'command': 'make comps-f43.xml' + 'file': 'comps-f44.xml', + 'command': 'make comps-f44.xml' } variants_file='variants-fedora.xml' -sigkeys = ['31645531'] +sigkeys = ['6D9F90A6'] # 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 = 'f43-build' +runroot_tag = 'f44-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f43-iot' +pkgset_koji_tag = 'f44-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -205,11 +205,11 @@ 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_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '43' +global_version = '44' # live_images ignores this in favor of live_target -global_target = 'f43' +global_target = 'f44' -imagebuilder_target = 'f43-image-builder' +imagebuilder_target = 'f44-image-builder' imagebuilder = { "^IoT$": [ { diff --git a/nightly.sh b/nightly.sh index 343e11e..53d8229 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.xml" +RELEASE="44" +RELEASE_TITLE="44" +COMPSFILE="comps-f44.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " diff --git a/sync-release.sh b/sync-release.sh index 0999c92..953d1fb 100755 --- a/sync-release.sh +++ b/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="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.xml" +RELEASE="44" +RELEASE_TITLE="44" +COMPSFILE="comps-f44.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/43/" +RSYNCTARGET="/pub/alt/iot/44/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 560183d..0cc7718 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.xml" +RELEASE="44" +RELEASE_TITLE="44" +COMPSFILE="comps-f44.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " From 29d8a41ea5c9ea25d81ce2c41e11741965f00d25 Mon Sep 17 00:00:00 2001 From: Anton Medvedev Date: Tue, 7 Oct 2025 21:35:53 +0200 Subject: [PATCH 77/83] 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 53d8229..de83430 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 0cc7718..4c012dd 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 96a8f98dc4bd592cac0b40fc9477c58a769e1bf2 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 6 Feb 2026 13:12:22 -0500 Subject: [PATCH 78/83] F-45: Update for branching Signed-off-by: Paul Whalen --- fedora-iot.conf | 20 ++++++++++---------- nightly.sh | 6 +++--- sync-bootc-base-containers.sh | 4 ++-- sync-release.sh | 8 ++++---- twoweek-nightly.sh | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 9cda9d0..f001679 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,9 +1,9 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '44' +release_version = '45' # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f44 runs. +# and OSTree installer we'll use inputs from other f45 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] # GENERAL SETTINGS @@ -11,11 +11,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f44.xml', - 'command': 'make comps-f44.xml' + 'file': 'comps-f45.xml', + 'command': 'make comps-f45.xml' } variants_file='variants-fedora.xml' -sigkeys = ['6D9F90A6'] +sigkeys = ['F577861E'] # 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 = 'f44-build' +runroot_tag = 'f45-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f44-iot' +pkgset_koji_tag = 'f45-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -205,11 +205,11 @@ 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_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '44' +global_version = '45' # live_images ignores this in favor of live_target -global_target = 'f44' +global_target = 'f45' -imagebuilder_target = 'f44-image-builder' +imagebuilder_target = 'f45-image-builder' imagebuilder = { "^IoT$": [ { diff --git a/nightly.sh b/nightly.sh index de83430..a28e1cb 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="44" -RELEASE_TITLE="44" -COMPSFILE="comps-f44.xml" +RELEASE="45" +RELEASE_TITLE="45" +COMPSFILE="comps-f45.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 6a7e03f..06ad1fc 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="41" +current_stable="43" # Define what is rawhide so we know to push that tag -current_rawhide="43" +current_rawhide="45" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then diff --git a/sync-release.sh b/sync-release.sh index 953d1fb..391d130 100755 --- a/sync-release.sh +++ b/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="44" -RELEASE_TITLE="44" -COMPSFILE="comps-f44.xml" +RELEASE="45" +RELEASE_TITLE="45" +COMPSFILE="comps-f45.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/44/" +RSYNCTARGET="/pub/alt/iot/45/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 4c012dd..3d8225b 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="44" -RELEASE_TITLE="44" -COMPSFILE="comps-f44.xml" +RELEASE="45" +RELEASE_TITLE="45" +COMPSFILE="comps-f45.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " From 087fe9f286ca2c3249b8fa3590855317ae987bb8 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Fri, 6 Feb 2026 15:13:08 -0500 Subject: [PATCH 79/83] fix: fedora-kickstarts retired Signed-off-by: Paul Whalen --- fedora-iot.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index f001679..709d616 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -202,12 +202,6 @@ 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' -global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '45' -# live_images ignores this in favor of live_target -global_target = 'f45' imagebuilder_target = 'f45-image-builder' imagebuilder = { From 4186f8b817a4cc0a71bf29408c79a761abbc4a4c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 27 Apr 2026 23:46:23 -0700 Subject: [PATCH 80/83] Restore global_release, global_version, global_target It's not entirely obvious, but these were not in fact tied to the old livemedia phase as 087fe9f thought; they are used by modern phases like imagebuilder and kiwi as well. Restore them, with a less misleading comment. Fixes: https://github.com/fedora-iot/iot-distro/issues/131 Signed-off-by: Adam Williamson --- fedora-iot.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 709d616..ce60e8e 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -202,6 +202,10 @@ translate_paths = [ ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'), ] +# These may be inherited by various phases for creating Koji tasks +global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' +global_version = '45' +global_target = 'f45' imagebuilder_target = 'f45-image-builder' imagebuilder = { From 5fe5764dbad29ffc382eb7dcfea12f7c07b9c109 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 28 Jul 2026 16:01:37 -0400 Subject: [PATCH 81/83] Update Pagure URLs to Forge for IoT compose - fedora-iot.conf: Update comps_file, ostree, and ostree_container config_urls to forge.fedoraproject.org (fedora-comps, ostree, base-images, fedora-iot-bootc) - fedora-iot.conf: Update pungi-fedora PR/issue comment links - nightly.sh: Update releng and fedora-comps clone URLs - twoweek-nightly.sh: Update releng clone URL Assisted-by: Claude Opus 4.6 Signed-off-by: Paul Whalen --- fedora-iot.conf | 12 ++++++------ nightly.sh | 4 ++-- twoweek-nightly.sh | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index ce60e8e..fe7c0d3 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -9,7 +9,7 @@ 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-f45.xml', 'command': 'make comps-f45.xml' @@ -166,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', @@ -183,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', @@ -262,7 +262,7 @@ ostree = { "force_new_commit": True, "unified_core": True, "treefile": "fedora-iot.yaml", - "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_url": "https://forge.fedoraproject.org/iot/ostree.git", "config_branch": "main", "repo": [ "IoT", @@ -281,7 +281,7 @@ ostree_container = { "^IoT$": [ { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/base-images", + "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/"], @@ -292,7 +292,7 @@ ostree_container = { }, { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", + "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/"], diff --git a/nightly.sh b/nightly.sh index a28e1cb..ea54ab7 100755 --- a/nightly.sh +++ b/nightly.sh @@ -30,7 +30,7 @@ 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 @@ -43,7 +43,7 @@ fi #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/ diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 3d8225b..6dc5a62 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -28,7 +28,7 @@ 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") From e8f17b68c4670aee848f878d63184acb84d5b11f Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 29 Jul 2026 10:51:09 -0400 Subject: [PATCH 82/83] Update releng script paths for tooling repo restructure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 Signed-off-by: Paul Whalen --- nightly.sh | 4 ++-- twoweek-nightly.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nightly.sh b/nightly.sh index ea54ab7..4859e4b 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_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") @@ -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 diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 6dc5a62..642e30d 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_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 From 3d9cd16f820df2fe268931157d2c3447d5bc7094 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 12 Aug 2026 10:17:54 -0400 Subject: [PATCH 83/83] Bump rawhide to Fedora 46 --- fedora-iot.conf | 18 +++++++++--------- nightly.sh | 6 +++--- sync-bootc-base-containers.sh | 4 ++-- sync-release.sh | 8 ++++---- twoweek-nightly.sh | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index fe7c0d3..a3a3c10 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,7 +1,7 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '45' +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 f45 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] @@ -11,11 +11,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f45.xml', - 'command': 'make comps-f45.xml' + 'file': 'comps-f46.xml', + 'command': 'make comps-f46.xml' } variants_file='variants-fedora.xml' -sigkeys = ['F577861E'] +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 = 'f45-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 = 'f45-iot' +pkgset_koji_tag = 'f46-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -204,10 +204,10 @@ translate_paths = [ # These may be inherited by various phases for creating Koji tasks global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '45' -global_target = 'f45' +global_version = '46' +global_target = 'f46' -imagebuilder_target = 'f45-image-builder' +imagebuilder_target = 'f46-image-builder' imagebuilder = { "^IoT$": [ { diff --git a/nightly.sh b/nightly.sh index 4859e4b..fa8dfcb 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="45" -RELEASE_TITLE="45" -COMPSFILE="comps-f45.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 " diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 06ad1fc..ebab8ee 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="43" +current_stable="44" # Define what is rawhide so we know to push that tag -current_rawhide="45" +current_rawhide="46" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then diff --git a/sync-release.sh b/sync-release.sh index 391d130..5badf8c 100755 --- a/sync-release.sh +++ b/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="45" -RELEASE_TITLE="45" -COMPSFILE="comps-f45.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 " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/45/" +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) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 642e30d..c0925c7 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="45" -RELEASE_TITLE="45" -COMPSFILE="comps-f45.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 "