From eb3db40bad4ae782f29c3c509d3f97bdc376450e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 17 Aug 2020 09:01:07 +0100 Subject: [PATCH 1/6] f33: 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 e1f359c..c9913ac 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/f33' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '33' # live_images ignores this in favor of live_target @@ -216,7 +216,7 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 4, 'arches': ['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-33/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": "master", + "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/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": "master", + "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/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": "master", + "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/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-33/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -290,16 +290,16 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-33-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': 'master', + 'template_branch': 'f33', }, "armhfp": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -311,16 +311,16 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-33-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': 'master', + 'template_branch': 'f33', }, "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-33/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -332,11 +332,11 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-33-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': 'master', + 'template_branch': 'f33', } }) ] diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index e2b1b05..aab154a 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 f98ceb1cd88a92f4aedfb1aea4e9ec65d7bba088 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 8 Oct 2020 11:49:54 +0100 Subject: [PATCH 2/6] imange_build: enable armhfp Signed-off-by: Peter Robinson --- fedora-iot.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index c9913ac..a49710b 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -215,9 +215,10 @@ image_build = { 'kickstart': 'fedora-iot.ks', 'distro': 'Fedora-22', 'disk_size': 4, - 'arches': ['aarch64', 'x86_64'], + 'arches': ['armhfp', 'aarch64', 'x86_64'], 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$arch/os/", 'subvariant': 'IoT', + 'failable': ['armhfp'], } } ], From 33a2ba411cf22c3eb7ba3f94c65579d57e768fd9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 9 Oct 2020 10:42:55 +0100 Subject: [PATCH 3/6] ARMv7 images are now working so we should remove the fail option Signed-off-by: Peter Robinson --- fedora-iot.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a49710b..33fd1f4 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -218,7 +218,6 @@ image_build = { 'arches': ['armhfp', 'aarch64', 'x86_64'], 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$arch/os/", 'subvariant': 'IoT', - 'failable': ['armhfp'], } } ], From a36fb3ec4bc76a91ffab37f34eaa1c3bb13db0db Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 29 Oct 2020 09:02:36 +0000 Subject: [PATCH 4/6] Update f33 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 33fd1f4..7ff5b99 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -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/branched/latest-Fedora-33/compose/Everything/$arch/os/", + 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -233,11 +233,11 @@ ostree = [ "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.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", "update_summary": True, }, "armhfp": { @@ -248,11 +248,11 @@ ostree = [ "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.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", "update_summary": True, }, "x86_64": { @@ -263,11 +263,11 @@ ostree = [ "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.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", "update_summary": True, } }) @@ -278,7 +278,7 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -290,8 +290,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-33-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': 'f33', @@ -299,7 +299,7 @@ ostree_installer = [ "armhfp": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -311,8 +311,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-33-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': 'f33', @@ -320,7 +320,7 @@ ostree_installer = [ "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-33/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -332,8 +332,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-33-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': 'f33', diff --git a/sync-release.sh b/sync-release.sh new file mode 100755 index 0000000..710ca75 --- /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="33" +RELEASE_TITLE="33" +COMPSFILE="comps-f33.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/33/" +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 aab154a..904e822 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 109d84f9d477d7a9fba367bd9dad89da8435e6a6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 3 Nov 2020 20:58:03 +0000 Subject: [PATCH 5/6] F-33 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 7ff5b99..f0a9dd8 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -233,7 +233,8 @@ ostree = [ "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -248,7 +249,8 @@ ostree = [ "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -263,7 +265,8 @@ ostree = [ "config_branch": "f33", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f33-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/33/Fedora-33-20201019.0/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -299,7 +303,8 @@ ostree_installer = [ "armhfp": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f33-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/33/Fedora-33-20201019.0/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/33/Fedora-33-20201019.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f33-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", From 4cc14b56b2ee74034a01fc4cde5bf154c8b72e0e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 13 Jan 2021 20:18:13 +0000 Subject: [PATCH 6/6] Update for git master -> main 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 f0a9dd8..7c1f74c 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': 'master', + 'branch': 'main', 'file': 'comps-f33.xml', 'command': 'make comps-f33.xml' }