From 0bd4fbd2b0827ac3ccac8a7b00ac3ee66b261683 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 27 Aug 2019 20:39:53 +0100 Subject: [PATCH 1/8] setup F-31 IoT for branched composes Signed-off-by: Peter Robinson --- fedora-iot.conf | 43 +++++++++++++++++++++++-------------------- twoweek-nightly.sh | 4 ++-- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 535fc74..002c30e 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -205,7 +205,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/f31' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '31' # live_images ignores this in favor of live_target @@ -220,7 +220,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-31/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -233,9 +233,10 @@ ostree = [ "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "master", + "config_branch": "f31", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -246,9 +247,10 @@ ostree = [ "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "master", + "config_branch": "f31", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -259,9 +261,10 @@ ostree = [ "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "master", + "config_branch": "f31", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -275,7 +278,7 @@ ostree_installer = [ ("^IoT$", { "aarch64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -287,15 +290,15 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-31", "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': 'f31', }, "armhfp": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -307,15 +310,15 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-31", "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': 'f31', }, "x86_64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -327,11 +330,11 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-31", "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': 'f31', } }) ] diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 70d1569..b0e9271 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -16,9 +16,9 @@ RELEASE_TITLE="31" COMPSFILE="comps-f31.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" -FROM="Fedora IoT Report " +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 a2d7ae27d29fdadc67bdcbc62e6149cda83c299a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 28 Oct 2019 11:01:44 +0000 Subject: [PATCH 2/8] Update f31 iot for stable Signed-off-by: Peter Robinson --- fedora-iot.conf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 002c30e..d279063 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -220,7 +220,7 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 4, 'arches': ['aarch64', 'x86_64'], - 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/", + !!'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -236,7 +236,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", + !!"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -250,7 +250,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", + !!"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -264,7 +264,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", + !!"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -290,8 +290,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-31", "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': 'f31', @@ -310,8 +310,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-31", "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': 'f31', @@ -330,8 +330,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-31", "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': 'f31', From 7d694577e370ab0410d79840bc3a07c812f7ed03 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 29 Oct 2019 06:26:24 +0000 Subject: [PATCH 3/8] f31: update URLS for base everything repos Signed-off-by: Peter Robinson --- fedora-iot.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index d279063..1197fd4 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -220,7 +220,7 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 4, 'arches': ['aarch64', 'x86_64'], - !!'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/", + !!'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -236,7 +236,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - !!"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", + !!"https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -250,7 +250,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - !!"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", + !!"https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -264,7 +264,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - !!"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$basearch/os/", + !!"https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -278,7 +278,7 @@ ostree_installer = [ ("^IoT$", { "aarch64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -298,7 +298,7 @@ ostree_installer = [ }, "armhfp": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -318,7 +318,7 @@ ostree_installer = [ }, "x86_64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-31/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", From 7de82ba61293754c3ab16102b75ff9e4c37ecf53 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 29 Oct 2019 06:30:04 +0000 Subject: [PATCH 4/8] f31: add sync-release.sh for f31 Signed-off-by: Peter Robinson --- sync-release.sh | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100755 sync-release.sh diff --git a/sync-release.sh b/sync-release.sh new file mode 100755 index 0000000..7da939f --- /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="31" +RELEASE_TITLE="31" +COMPSFILE="comps-f31.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/31/" +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 {} \; From 9f5acbf93f1cb40556147ce08633754c0319a845 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 29 Oct 2019 08:18:25 +0000 Subject: [PATCH 5/8] drop notes to me Signed-off-by: Peter Robinson --- fedora-iot.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 1197fd4..86a019b 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -220,7 +220,7 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 4, 'arches': ['aarch64', 'x86_64'], - !!'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/", + 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -236,7 +236,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - !!"https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -250,7 +250,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - !!"https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -264,7 +264,7 @@ ostree = [ "config_branch": "f31", "repo": [ "IoT", - !!"https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", From 267cffa7e51c4ad8bd30b821332a2f2c46c4b2cb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 4 Nov 2019 14:34:32 +0000 Subject: [PATCH 6/8] add updates and override repos Signed-off-by: Peter Robinson --- fedora-iot.conf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 86a019b..5cfed26 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -237,6 +237,7 @@ ostree = [ "repo": [ "IoT", "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f31-updates/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -251,6 +252,7 @@ ostree = [ "repo": [ "IoT", "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f31-updates/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -265,6 +267,7 @@ ostree = [ "repo": [ "IoT", "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f31-updates/compose/Everything/$basearch/os/", ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -278,7 +281,8 @@ ostree_installer = [ ("^IoT$", { "aarch64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/", ], "release": None, "rootfs_size": "4", @@ -298,7 +302,8 @@ ostree_installer = [ }, "armhfp": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/", ], "release": None, "rootfs_size": "4", @@ -318,7 +323,8 @@ ostree_installer = [ }, "x86_64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/31/latest-Fedora-31/compose/Everything/$arch/os/", ], "release": None, "rootfs_size": "4", From 6fd91d817a23264c7dc5861289bdcf17b449f951 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 5 Dec 2019 11:05:16 +0000 Subject: [PATCH 7/8] update compose script for post release Signed-off-by: Peter Robinson --- twoweek-nightly.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index b0e9271..631c1f9 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 de418b98d8fc9e4f143e9a05c03a746c46fa9ac6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 19 Feb 2020 10:19:22 +0000 Subject: [PATCH 8/8] Update F-31 ostree key name Signed-off-by: Peter Robinson --- fedora-iot.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 5cfed26..c5a0d4b 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -292,7 +292,7 @@ ostree_installer = [ "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-31", + "ostree_oskey=fedora-31-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/stable/aarch64/iot", "ostree_update_ref=fedora/stable/aarch64/iot", @@ -313,7 +313,7 @@ ostree_installer = [ "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-31", + "ostree_oskey=fedora-31-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/stable/armhfp/iot", "ostree_update_ref=fedora/stable/armhfp/iot", @@ -334,7 +334,7 @@ ostree_installer = [ "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-31", + "ostree_oskey=fedora-31-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",