From 6d2199c6c5351a41d3056679f13c7c03131fb44c Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 14 Aug 2023 13:43:08 -0400 Subject: [PATCH 1/6] F39: Update for branching Signed-off-by: Paul Whalen --- fedora-iot.conf | 40 ++++++++++++++++++++-------------------- twoweek-nightly.sh | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 5e58483..4ed6304 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -11,7 +11,7 @@ ostree_installer_overwrite = True comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', - 'branch': 'main', + 'branch': 'f39', 'file': 'comps-f39.xml', 'command': 'make comps-f39.xml' } @@ -204,7 +204,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/f39' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '39' # live_images ignores this in favor of live_target @@ -219,9 +219,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-39/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", }, { @@ -231,9 +231,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-39/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", }, ], @@ -246,14 +246,14 @@ ostree = [ "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", + "config_branch": "f39", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/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", "update_summary": True, }, "x86_64": { @@ -261,14 +261,14 @@ ostree = [ "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", + "config_branch": "f39", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/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", "update_summary": True, } }) @@ -279,7 +279,7 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -291,16 +291,16 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-39-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "ostree_install_ref=fedora/rawhide/aarch64/iot", - "ostree_update_ref=fedora/rawhide/aarch64/iot", + "ostree_install_ref=fedora/devel/aarch64/iot", + "ostree_update_ref=fedora/devel/aarch64/iot", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'main', + 'template_branch': 'f39', }, "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -312,11 +312,11 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-39-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "ostree_install_ref=fedora/rawhide/x86_64/iot", - "ostree_update_ref=fedora/rawhide/x86_64/iot", + "ostree_install_ref=fedora/devel/x86_64/iot", + "ostree_update_ref=fedora/devel/x86_64/iot", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'main', + 'template_branch': 'f39', } }) ] diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 6a10825..7ad52f2 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 f96d7d221691e1cbe74d27c841a252da3e6935fe Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 16 Aug 2023 14:07:41 -0400 Subject: [PATCH 2/6] Fix comps url, there are no branches 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 4ed6304..501e81a 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -11,7 +11,7 @@ ostree_installer_overwrite = True comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', - 'branch': 'f39', + 'branch': 'main', 'file': 'comps-f39.xml', 'command': 'make comps-f39.xml' } From 0a07d39edef0b46f15b3a81b74dbb02b19320985 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 1 Nov 2023 15:57:29 -0400 Subject: [PATCH 3/6] Update F39 to stable Signed-off-by: Paul Whalen --- fedora-iot.conf | 28 ++++++++++++++-------------- twoweek-nightly.sh | 3 +++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 501e81a..515c2f8 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -219,9 +219,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-39/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/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", }, { @@ -231,9 +231,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-39/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/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", }, ], @@ -249,11 +249,11 @@ ostree = [ "config_branch": "f39", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/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", "update_summary": True, }, "x86_64": { @@ -264,11 +264,11 @@ ostree = [ "config_branch": "f39", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/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", "update_summary": True, } }) @@ -279,7 +279,7 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -291,8 +291,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-39-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "ostree_install_ref=fedora/devel/aarch64/iot", - "ostree_update_ref=fedora/devel/aarch64/iot", + "ostree_install_ref=fedora/stable/aarch64/iot", + "ostree_update_ref=fedora/stable/aarch64/iot", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'f39', @@ -300,7 +300,7 @@ ostree_installer = [ "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-39/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -312,8 +312,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-39-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "ostree_install_ref=fedora/devel/x86_64/iot", - "ostree_update_ref=fedora/devel/x86_64/iot", + "ostree_install_ref=fedora/stable/x86_64/iot", + "ostree_update_ref=fedora/stable/x86_64/iot", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'f39', diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 7ad52f2..79781f3 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -49,6 +49,9 @@ if [ "$?" != "0" ]; then fi ostree summary --update --repo=/mnt/koji/compose/iot/repo/ +# Exit now we're post release +exit 1 + NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') From faf4c3899f8993a1b4a425525414740c98a27afb Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Sun, 12 Nov 2023 16:19:41 -0500 Subject: [PATCH 4/6] F-39 IoT: enable updates repo Signed-off-by: Paul Whalen --- fedora-iot.conf | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 515c2f8..f551ec2 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -219,7 +219,8 @@ osbuild = { "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", @@ -231,7 +232,8 @@ osbuild = { "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, "arches": ["x86_64", "aarch64"], - "repo": ["https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/"], + "repo": ["https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/"], "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", @@ -249,7 +251,8 @@ ostree = [ "config_branch": "f39", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -264,7 +267,8 @@ ostree = [ "config_branch": "f39", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -279,7 +283,8 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -300,7 +305,8 @@ ostree_installer = [ "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/39/Fedora-39-20231031.1/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f39-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", From e89230f284b4b1a4627682ff4d6484248cd92eb8 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 31 Jan 2024 14:40:23 -0500 Subject: [PATCH 5/6] Drop duplicated version in osbuild deliverables 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 f551ec2..96fa6fd 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -214,7 +214,6 @@ osbuild = { "^IoT$": [ { "name": "%s" % release_name, - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "distro": "fedora-39", "image_types": ["iot-raw-image"], "target": "f%s-candidate" % release_version, @@ -227,7 +226,6 @@ osbuild = { }, { "name": "%s-ostree" % release_name, - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "distro": "fedora-39", "image_types": ["iot-installer"], "target": "f%s-candidate" % release_version, From 6bed50c5c4177fc7a68429d79b1003f654236cdd Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 3 Nov 2023 11:22:42 -0700 Subject: [PATCH 6/6] Set correct productmd image type for osbuild installer image In the productmd metadata, these osbuild-built installer images have their 'type' as "dvd". This is not correct: the "dvd" type is meant to be a traditional RPM-based installer image, like the old Everything DVD or the current Server DVD. The correct "type" for an ostree installer image is "dvd-ostree" or "dvd-ostree-osbuild". This 'manifest_type' thing was added after the discussion in https://pagure.io/pungi-fedora/pull-request/1190 , to let us specify the productmd type for osbuild-built images correctly. In this case we want to use "dvd-ostree-osbuild" because for F39 the osbuild image is "experimental" and there still exists an image built the older way which has the "dvd-ostree" type, so we don't want to collide with it. The practical consequence of this at present is the osbuild images aren't getting openQA testing, because openQA relies on this property to identify the image, and it's not expecting to see "dvd". As of right now it also would not test an image with "dvd-ostree-osbuild" type, but I can easily update it to test those images the same way it tests "dvd-ostree" images. Signed-off-by: Adam Williamson --- fedora-iot.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 96fa6fd..85eb53d 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -235,6 +235,7 @@ osbuild = { "ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_ref": "fedora/stable/$arch/iot", "subvariant": "IoT", + "manifest_type": "dvd-ostree-osbuild", }, ], }