From 1bc3d0c8bcb2e9b07c03a33cac86bf2198cc823f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 13 Aug 2022 15:19:42 +0100 Subject: [PATCH 1/4] f37: update for branching Signed-off-by: Peter Robinson --- fedora-iot.conf | 32 ++++++++++++++++---------------- nightly.sh | 6 +++--- sync-release.sh | 8 ++++---- twoweek-nightly.sh | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 9dd2805..92d8149 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/f37' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '37' # live_images ignores this in favor of live_target @@ -216,7 +216,7 @@ image_build = { 'distro': 'Fedora-30', '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-37/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": "f37", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/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": { @@ -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": "f37", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/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, } }) @@ -263,7 +263,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-37/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -275,16 +275,16 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-37-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': 'f37', }, "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-37/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -296,11 +296,11 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-37-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': 'f37', } }) ] diff --git a/nightly.sh b/nightly.sh index d4f2617..0722118 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="30" -RELEASE_TITLE="30" -COMPSFILE="comps-f30.xml" +RELEASE="37" +RELEASE_TITLE="37" +COMPSFILE="comps-f37.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " diff --git a/sync-release.sh b/sync-release.sh index 91069ab..0fe13dc 100755 --- a/sync-release.sh +++ b/sync-release.sh @@ -12,14 +12,14 @@ 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" +RELEASE="37" +RELEASE_TITLE="37" +COMPSFILE="comps-f37.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/" +RSYNCTARGET="/pub/alt/iot/37/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 059993c..c0998a0 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 03f82e7e4515cde91b77a24896d9f0a2dd0679f6 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 16 Aug 2022 08:13:37 -0400 Subject: [PATCH 2/4] Set createiso to use xorrisofs (should fix compose) This is needed since this Change: https://fedoraproject.org/wiki/Changes/BIOSBootISOWithGrub2 Signed-off-by: Adam Williamson --- fedora-iot.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-iot.conf b/fedora-iot.conf index 92d8149..b4f65e7 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -64,6 +64,10 @@ media_checksum_base_filename = '%(release_short)s-%(version)s-%(arch)s-%(date)s% #jigdo create_jigdo = False +# CREATEISO +# use xorrisofs to make isos +createiso_use_xorrisofs = True + # BUILDINSTALL buildinstall_method = 'lorax' buildinstall_skip = [ From 457e8b845641a0fe1c623c44b77fe8c140eaf9b5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 16 Nov 2022 12:46:40 +0000 Subject: [PATCH 3/4] Update F-37 IoT for stable Signed-off-by: Peter Robinson --- fedora-iot.conf | 22 +++++++++++----------- twoweek-nightly.sh | 3 +++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index b4f65e7..746ab90 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -220,7 +220,7 @@ image_build = { 'distro': 'Fedora-30', 'disk_size': 4, 'arches': ['aarch64', 'x86_64'], - 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$arch/os/", + 'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/", 'subvariant': 'IoT', } } @@ -237,11 +237,11 @@ ostree = [ "config_branch": "f37", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.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": { @@ -252,11 +252,11 @@ ostree = [ "config_branch": "f37", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.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, } }) @@ -267,7 +267,7 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -279,8 +279,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-37-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': 'f37', @@ -288,7 +288,7 @@ ostree_installer = [ "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-37/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -300,8 +300,8 @@ ostree_installer = [ "ostree_osname=fedora-iot", "ostree_oskey=fedora-37-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': 'f37', diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index c0998a0..aea4ae7 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 51ef67914dac2539d448e5678ff3fcfcbc01aa39 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 21 Nov 2022 10:26:51 +0000 Subject: [PATCH 4/4] F-37 IoT: enable updates repo Signed-off-by: Peter Robinson --- fedora-iot.conf | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 746ab90..d7807fc 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -237,7 +237,8 @@ ostree = [ "config_branch": "f37", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -252,7 +253,8 @@ ostree = [ "config_branch": "f37", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$basearch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", @@ -267,7 +269,8 @@ ostree_installer = [ "aarch64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4", @@ -288,7 +291,8 @@ ostree_installer = [ "x86_64": { "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/" + "https://kojipkgs.fedoraproject.org/compose/37/Fedora-37-20221105.0/compose/Everything/$arch/os/", + "https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/" ], "release": None, "rootfs_size": "4",