From 5b6b436d4892a2132a1d49432d33a4c4b95bdfde Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 17 Feb 2020 16:41:40 +0000 Subject: [PATCH 1/9] f32: update for branching Signed-off-by: Peter Robinson --- fedora-iot.conf | 44 ++++++++++++++++++++++---------------------- twoweek-nightly.sh | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 79c5db6..b704f16 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -202,7 +202,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-32/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -216,13 +216,13 @@ ostree = [ "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "master", + "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/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", "failable": ['*'], "update_summary": True, }, @@ -231,13 +231,13 @@ ostree = [ "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "master", + "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/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", "failable": ['*'], "update_summary": True, }, @@ -246,13 +246,13 @@ ostree = [ "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", - "config_branch": "master", + "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/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", "failable": ['*'], "update_summary": True, } @@ -263,7 +263,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-32/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -275,15 +275,15 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-32", "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': 'f32', }, "armhfp": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -295,15 +295,15 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-32", "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': 'f32', }, "x86_64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -315,11 +315,11 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-32", "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': 'f32', } }) ] diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index fa59364..271fa85 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 4e49ff1d922ed01dbb518721b34bd280b24e9afb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 17 Feb 2020 19:05:02 +0000 Subject: [PATCH 2/9] Re-add gather method --- fedora-iot.conf | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index b704f16..879d7c2 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -4,7 +4,7 @@ release_short = 'Fedora-IoT' release_version = '32' # Let's not build install media during this run. For the image builds # and OSTree installer we'll use inputs from other f32 runs. -skip_phases = ["buildinstall", "gather", "createrepo", "extra_files"] +skip_phases = ["buildinstall", "createrepo", "extra_files"] ostree_installer_overwrite = True # GENERAL SETTINGS @@ -43,6 +43,20 @@ pkgset_koji_inherit = False filter_system_release_packages = False +# GATHER +gather_method = { + '^.*': { # For all variants + 'comps': 'deps', # resolve dependencies for packages from comps file + 'module': 'nodeps', # but not for packages from modules + } +} +gather_backend = 'dnf' +gather_profiler = True +check_deps = False +greedy_method = 'build' + +repoclosure_backend = 'dnf' + # CHECKSUMS media_checksums = ['sha256'] media_checksum_one_file = True From b75231ce070deee1ed2a2d8b2603b09801790902 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 19 Feb 2020 10:18:09 +0000 Subject: [PATCH 3/9] Update F-32 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 879d7c2..ba2591a 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -287,7 +287,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-32", + "ostree_oskey=fedora-32-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/devel/aarch64/iot", "ostree_update_ref=fedora/devel/aarch64/iot", @@ -307,7 +307,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-32", + "ostree_oskey=fedora-32-primary", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/devel/armhfp/iot", "ostree_update_ref=fedora/devel/armhfp/iot", @@ -327,7 +327,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-32", + "ostree_oskey=fedora-32-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", From 8e69b840e4f86d430596221ef4c9ade21a287b98 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 4 Mar 2020 19:10:21 +0000 Subject: [PATCH 4/9] Fix ks image branch location 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 ba2591a..7e90cb0 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/f32' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '32' # live_images ignores this in favor of live_target From 906e3aaf410e81f10a29ba16ff57f4073c77b7dd Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 28 Apr 2020 15:10:20 +0100 Subject: [PATCH 5/9] Update f32 iot for stable Signed-off-by: Peter Robinson --- fedora-iot.conf | 29 +++++++++++++------------ sync-release.sh | 53 ++++++++++++++++++++++++++++++++++++++++++++++ twoweek-nightly.sh | 3 +++ 3 files changed, 72 insertions(+), 13 deletions(-) create mode 100755 sync-release.sh diff --git a/fedora-iot.conf b/fedora-iot.conf index 7e90cb0..a1306d1 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -216,7 +216,7 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 4, 'arches': ['aarch64', 'x86_64'], - 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$arch/os/", + 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -232,7 +232,7 @@ ostree = [ "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -247,7 +247,7 @@ ostree = [ "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -262,7 +262,7 @@ ostree = [ "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -277,7 +277,8 @@ ostree_installer = [ ("^IoT$", { "aarch64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$arch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -289,15 +290,16 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-32-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': 'f32', }, "armhfp": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$arch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -309,15 +311,16 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-32-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': 'f32', }, "x86_64": { "repo": [ - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-32/compose/Everything/$arch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -329,8 +332,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-32-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': 'f32', diff --git a/sync-release.sh b/sync-release.sh new file mode 100755 index 0000000..88af72b --- /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="32" +RELEASE_TITLE="32" +COMPSFILE="comps-f32.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/32/" +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 271fa85..13fbaaa 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 483be44bd86f30f6bd3902dcb9924a5087c32efc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 29 Apr 2020 10:32:18 +0100 Subject: [PATCH 6/9] F-32 IoT: enable updates repo Signed-off-by: Peter Robinson --- fedora-iot.conf | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index a1306d1..d5228be 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -232,11 +232,13 @@ ostree = [ "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/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", "failable": ['*'], "update_summary": True, }, @@ -247,11 +249,13 @@ ostree = [ "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/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", "failable": ['*'], "update_summary": True, }, @@ -262,11 +266,13 @@ ostree = [ "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "f32", "repo": [ - "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/" + "IoT", + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/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", "failable": ['*'], "update_summary": True, } @@ -278,7 +284,8 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -299,7 +306,8 @@ ostree_installer = [ "armhfp": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -320,7 +328,8 @@ ostree_installer = [ "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", From a2b532cfe2f40c997eef347ab04bd72c93633a09 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 13 May 2020 11:27:22 -0400 Subject: [PATCH 7/9] Generating .composeinfo file after the compose run Signed-off-by: Mohan Boddu --- nightly.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nightly.sh b/nightly.sh index afcf79b..1dee5cf 100755 --- a/nightly.sh +++ b/nightly.sh @@ -67,6 +67,8 @@ 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" + # Set this to use later for a few items include depcheck DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID # Public URLs the synced compose will wind up at, we put them in fedmsgs From 9ab25fac18959c8efa1824ad99ce3298aa03010d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 14 May 2020 11:29:25 +0100 Subject: [PATCH 8/9] Add .composeinfo generation to twoweek script too Signed-off-by: Peter Robinson --- twoweek-nightly.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 13fbaaa..332a871 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -49,12 +49,14 @@ 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') +./releng/scripts/build_composeinfo "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID" + +# Exit now we're post release +exit 1 + 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" From 45a2feb283d41d6c11449742f7dc9e6d0ea22313 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 11 Aug 2020 12:09:31 +0100 Subject: [PATCH 9/9] The ostree component should fail the compose Signed-off-by: Peter Robinson --- fedora-iot.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index d5228be..9d7c20a 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -239,7 +239,6 @@ ostree = [ "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_ref": "fedora/stable/${basearch}/iot", - "failable": ['*'], "update_summary": True, }, "armhfp": { @@ -256,7 +255,6 @@ ostree = [ "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_ref": "fedora/stable/${basearch}/iot", - "failable": ['*'], "update_summary": True, }, "x86_64": { @@ -273,7 +271,6 @@ ostree = [ "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_ref": "fedora/stable/${basearch}/iot", - "failable": ['*'], "update_summary": True, } })