From 8d1ef8a100333e19ea815da326b1c099fb303a85 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 9 Feb 2022 10:40:29 +0000 Subject: [PATCH 1/7] f36: update for branching Signed-off-by: Peter Robinson --- fedora-iot.conf | 46 +++++++++++++++++++++++----------------------- twoweek-nightly.sh | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 579d34d..f1324a1 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -200,7 +200,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/f36' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '36' # live_images ignores this in favor of live_target @@ -216,7 +216,7 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 4, 'arches': ['armhfp', 'aarch64', 'x86_64'], - 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/", + 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -230,14 +230,14 @@ ostree = [ "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", + "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/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, }, "armhfp": { @@ -245,14 +245,14 @@ ostree = [ "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", + "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/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": { @@ -260,14 +260,14 @@ ostree = [ "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "main", + "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/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, } }) @@ -278,7 +278,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-36/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -290,16 +290,16 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-36-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': 'f36', }, "armhfp": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -311,16 +311,16 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-36-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "ostree_install_ref=fedora/rawhide/armhfp/iot", - "ostree_update_ref=fedora/rawhide/armhfp/iot", + "ostree_install_ref=fedora/devel/armhfp/iot", + "ostree_update_ref=fedora/devel/armhfp/iot", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', - 'template_branch': 'main', + 'template_branch': 'f36', }, "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-36/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -332,11 +332,11 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-36-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': 'f36', } }) ] diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 3d13535..2ee506b 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 40df2c0472486aacd4c7539e566b88cc2e6775be Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 9 Feb 2022 17:18:38 +0000 Subject: [PATCH 2/7] Update Fedora 36 key 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 f1324a1..2eac773 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -16,7 +16,7 @@ comps_file = { 'command': 'make comps-f36.xml' } variants_file='variants-fedora.xml' -sigkeys = ['9867C58F'] +sigkeys = ['38AB71F4'] # limit tree architectures # if undefined, all architectures from variants.xml will be included From d1bdc1a6cca25b91c28a504757fe021493f84700 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 17 Feb 2022 15:26:19 +0000 Subject: [PATCH 3/7] Update Image Builder to Fedora 30 to ensure UEFI firmware for build VM --- fedora-iot.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 2eac773..e3d7fc0 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -213,7 +213,7 @@ image_build = { 'format': [('raw-xz','raw.xz')], 'name': 'Fedora-IoT', 'kickstart': 'fedora-iot.ks', - 'distro': 'Fedora-22', + 'distro': 'Fedora-30', 'disk_size': 4, 'arches': ['armhfp', 'aarch64', 'x86_64'], 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$arch/os/", From 29a85246543438da813a3e46bced5e61096619e1 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Mon, 25 Apr 2022 16:16:28 -0400 Subject: [PATCH 4/7] Remove duplicated 'IoT' in release artifacts. 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 e3d7fc0..0b4b919 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -60,7 +60,7 @@ repoclosure_backend = 'dnf' # CHECKSUMS media_checksums = ['sha256'] media_checksum_one_file = True -media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s' +media_checksum_base_filename = '%(release_short)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s' #jigdo create_jigdo = False @@ -149,10 +149,10 @@ createiso_skip = [ #] # Image name respecting Fedora's image naming policy -image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' +image_name_format = '%(release_short)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' # # Use the same format for volume id image_volid_formats = [ - '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' + '%(release_short)s-%(disc_type)s-%(arch)s-%(version)s' ] # No special handling for layered products, use same format as for regular images image_volid_layered_product_formats = [] From 7cf680ee509915ab84e7076038c82b55a1e3081c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 May 2022 09:55:46 +0100 Subject: [PATCH 5/7] Update F-36 IoT for stable Signed-off-by: Peter Robinson --- fedora-iot.conf | 32 ++++++++++++++-------------- sync-release.sh | 53 ++++++++++++++++++++++++++++++++++++++++++++++ twoweek-nightly.sh | 3 +++ 3 files changed, 72 insertions(+), 16 deletions(-) create mode 100755 sync-release.sh diff --git a/fedora-iot.conf b/fedora-iot.conf index 0b4b919..38ec5e3 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -216,7 +216,7 @@ image_build = { 'distro': 'Fedora-30', 'disk_size': 4, 'arches': ['armhfp', 'aarch64', 'x86_64'], - 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$arch/os/", + 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -233,11 +233,11 @@ ostree = [ "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.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, }, "armhfp": { @@ -248,11 +248,11 @@ ostree = [ "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.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": { @@ -263,11 +263,11 @@ ostree = [ "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.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, } }) @@ -278,7 +278,7 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -290,8 +290,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-36-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': 'f36', @@ -299,7 +299,7 @@ ostree_installer = [ "armhfp": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -311,8 +311,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-36-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "ostree_install_ref=fedora/devel/armhfp/iot", - "ostree_update_ref=fedora/devel/armhfp/iot", + "ostree_install_ref=fedora/stable/armhfp/iot", + "ostree_update_ref=fedora/stable/armhfp/iot", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'f36', @@ -320,7 +320,7 @@ ostree_installer = [ "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-36/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -332,8 +332,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-36-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': 'f36', diff --git a/sync-release.sh b/sync-release.sh new file mode 100755 index 0000000..91069ab --- /dev/null +++ b/sync-release.sh @@ -0,0 +1,53 @@ +#!/bin/sh +set -x +export LC_ALL=C +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" +TARGET_DIR="/mnt/koji/compose/iot" +NIGHTLY="" +DEST=$(pwd) +DATE=$(date "+%Y%m%d") +# the Pungi 'shortname', which we will include in fedmsgs for disambiguation +SHORT="Fedora-IoT" +RELEASE="36" +RELEASE_TITLE="36" +COMPSFILE="comps-f36.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/36/" +OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) + +NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) +SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') + +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 +# 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 IoT'$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 {} \; diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 2ee506b..96c02fd 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 1a13ca489bbd7ad3f3d06d0fb212fd0655d2b704 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 May 2022 20:11:30 +0100 Subject: [PATCH 6/7] F-36 IoT: enable updates repo Signed-off-by: Peter Robinson --- fedora-iot.conf | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 38ec5e3..cc60fb8 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -233,7 +233,8 @@ ostree = [ "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -248,7 +249,8 @@ ostree = [ "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -263,7 +265,8 @@ ostree = [ "config_branch": "f36", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -278,7 +281,8 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -299,7 +303,8 @@ ostree_installer = [ "armhfp": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -320,7 +325,8 @@ ostree_installer = [ "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", From 2d18feb4e091014b2d3e6d81caf19fcad14d63ea Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 21 Nov 2022 10:36:52 +0000 Subject: [PATCH 7/7] F-36: drop aarch64/x86_64 as they're now on F-37, keep armhfp until F-36 is EOL Signed-off-by: Peter Robinson --- fedora-iot.conf | 78 +------------------------------------------------ 1 file changed, 1 insertion(+), 77 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index cc60fb8..3c3e153 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -215,7 +215,7 @@ image_build = { 'kickstart': 'fedora-iot.ks', 'distro': 'Fedora-30', 'disk_size': 4, - 'arches': ['armhfp', 'aarch64', 'x86_64'], + 'arches': ['armhfp'], 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/", 'subvariant': 'IoT', } @@ -225,22 +225,6 @@ image_build = { ostree = [ ("^IoT$", { - "aarch64": { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "force_new_commit": True, - "treefile": "fedora-iot.json", - "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "f36", - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$basearch/os/" - ] - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/iot/repo/", - "ostree_ref": "fedora/stable/${basearch}/iot", - "update_summary": True, - }, "armhfp": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "force_new_commit": True, @@ -257,49 +241,11 @@ ostree = [ "ostree_ref": "fedora/stable/${basearch}/iot", "update_summary": True, }, - "x86_64": { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "force_new_commit": True, - "treefile": "fedora-iot.json", - "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "f36", - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$basearch/os/" - ] - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/iot/repo/", - "ostree_ref": "fedora/stable/${basearch}/iot", - "update_summary": True, - } }) ] ostree_installer = [ ("^IoT$", { - "aarch64": { - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$arch/os/" - ], - "release": None, - "rootfs_size": "4", - "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", - "ostree-based-installer/lorax-embed-repo.tmpl"], - "add_template_var": [ - "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_update_repo=https://ostree.fedoraproject.org/iot/", - "ostree_osname=fedora-iot", - "ostree_oskey=fedora-36-primary", - "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "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': 'f36', - }, "armhfp": { "repo": [ "IoT", @@ -322,28 +268,6 @@ ostree_installer = [ 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_branch': 'f36', }, - "x86_64": { - "repo": [ - "IoT", - "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$arch/os/" - ], - "release": None, - "rootfs_size": "4", - "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", - "ostree-based-installer/lorax-embed-repo.tmpl"], - "add_template_var": [ - "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_update_repo=https://ostree.fedoraproject.org/iot/", - "ostree_osname=fedora-iot", - "ostree_oskey=fedora-36-primary", - "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", - "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': 'f36', - } }) ]