From ff31a0358a281fceb52db1f3803e19d7781e2a89 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Thu, 30 Jul 2026 16:45:05 -0400 Subject: [PATCH] Update Pagure URLs to Forge and releng script paths for f44 - fedora-iot.conf: Update comps_file, ostree, and ostree_container config_urls to forge.fedoraproject.org - fedora-iot.conf: Update pungi-fedora PR/issue comment links - nightly.sh: Update releng clone URL and script paths - twoweek-nightly.sh: Update releng clone URL and script paths Assisted-by: Claude Opus 4.6 Signed-off-by: Paul Whalen --- fedora-iot.conf | 12 ++++++------ nightly.sh | 8 ++++---- twoweek-nightly.sh | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 512d21d..2c19e01 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -9,7 +9,7 @@ skip_phases = ["buildinstall", "createrepo", "extra_files"] # GENERAL SETTINGS comps_file = { 'scm': 'git', - 'repo': 'https://pagure.io/fedora-comps.git', + 'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git', 'branch': 'main', 'file': 'comps-f44.xml', 'command': 'make comps-f44.xml' @@ -166,7 +166,7 @@ image_volid_layered_product_formats = [] # allow Pungi to tell it what volume ID to use. Note: # https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy # '-Workstation-' is a temporary workaround. See -# https://pagure.io/pungi-fedora/pull-request/525 +# https://forge.fedoraproject.org/releng/pungi-fedora/pulls/525 volume_id_substitutions = { 'Beta': 'B', 'Rawhide': 'rawh', @@ -183,7 +183,7 @@ volume_id_substitutions = { 'IoT': 'iot', 'Jam_KDE': 'Jam', 'MATE_Compiz': 'MATE', - # Note https://pagure.io/pungi-fedora/issue/533 + # Note https://forge.fedoraproject.org/releng/pungi-fedora/issues/533 'Python-Classroom': 'Clss', 'Python_Classroom': 'Clss', 'Robotics': 'Robo', @@ -266,7 +266,7 @@ ostree = { "force_new_commit": True, "unified_core": True, "treefile": "fedora-iot.yaml", - "config_url": "https://pagure.io/fedora-iot/ostree.git", + "config_url": "https://forge.fedoraproject.org/iot/ostree.git", "config_branch": "f44", "repo": [ "IoT", @@ -286,7 +286,7 @@ ostree_container = { "^IoT$": [ { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/base-images", + "config_url": "https://forge.fedoraproject.org/iot/base-images.git", "config_branch": "main", "treefile": "fedora-44.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/44/Fedora-44-20260422.1/compose/Everything/$basearch/os/", @@ -298,7 +298,7 @@ ostree_container = { }, { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git", + "config_url": "https://forge.fedoraproject.org/iot/fedora-iot-bootc.git", "config_branch": "main", "treefile": "fedora-iot-44.yaml", "repo": ["https://kojipkgs.fedoraproject.org/compose/44/Fedora-44-20260422.1/compose/Everything/$basearch/os/", diff --git a/nightly.sh b/nightly.sh index de83430..1dcb28d 100755 --- a/nightly.sh +++ b/nightly.sh @@ -30,20 +30,20 @@ if [ -d releng ]; then git pull --rebase popd else - git clone https://pagure.io/releng.git + git clone https://forge.fedoraproject.org/releng/tooling.git releng fi # Set up our fedmsg function, using the releng repo definition #FEDMSG_MODNAME="compose" #FEDMSG_CERTPREFIX="releng" -. ./releng/scripts_new/infrastructure/messaging/fedora_messaging.sh +. ./releng/infrastructure/messaging/fedora_messaging.sh # Announce that we are starting, even though we don't know the compose_id yet.. #fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT") #send_fedmsg "${fedmsg_json_start}" ${RELEASE} start #pushd $TMPDIR -#git clone https://pagure.io/fedora-comps.git && { +#git clone https://forge.fedoraproject.org/releng/fedora-comps.git && { # pushd fedora-comps # make "${COMPSFILE}" # cp "${COMPSFILE}" $DEST/ @@ -67,7 +67,7 @@ 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" +./releng/builds/compose/build_composeinfo.py "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID" # Set this to use later for a few items include depcheck DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 3f555a3..c777e62 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -28,13 +28,13 @@ if [ -d releng ]; then git pull --rebase popd else - git clone https://pagure.io/releng.git + git clone https://forge.fedoraproject.org/releng/tooling.git releng fi # Set up our fedmsg function, using the releng repo definition fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT") FEDMSG_MODNAME="compose" FEDMSG_CERTPREFIX="releng" -. ./releng/scripts_new/infrastructure/messaging/fedora_messaging.sh +. ./releng/infrastructure/messaging/fedora_messaging.sh # Announce that we are starting... send_fedmsg "${fedmsg_json_start}" ${RELEASE} start CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL" @@ -52,7 +52,7 @@ ostree summary --update --repo=/mnt/koji/compose/iot/repo/ 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" +./releng/builds/compose/build_composeinfo.py "$TARGET_DIR/$NEWCOMPOSE_ID/" --name "$NEWCOMPOSE_ID" DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID # Public URL the synced compose will wind up at, we put it in fedmsgs @@ -67,7 +67,7 @@ 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 + $RSYNCPREFIX ./releng/builds/compose/build_composeinfo.py "$RSYNCTARGET/" --name $NEWCOMPOSE_ID done # Tell everyone by fedmsg about the compose send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete -- 2.55.0