Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
Paul Whalen
ff31a0358a 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 <noreply@anthropic.com>
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2026-07-30 16:45:05 -04:00
Paul Whalen
6950bf86dc f44: enable updates
Generated-by: Claude Code
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2026-04-28 14:57:23 -04:00
Paul Whalen
d05dcb152d F-44: Update for stable
Generated-by: Claude Code
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2026-04-24 11:34:33 -04:00
Paul Whalen
c3f1fea2cd fix: fedora-kickstarts retired
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2026-02-06 15:00:42 -05:00
Paul Whalen
08d79f79d3 F-44: Update for branching
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2026-02-06 13:13:29 -05:00
4 changed files with 36 additions and 31 deletions

View file

@ -9,7 +9,7 @@ skip_phases = ["buildinstall", "createrepo", "extra_files"]
# GENERAL SETTINGS # GENERAL SETTINGS
comps_file = { comps_file = {
'scm': 'git', 'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git', 'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git',
'branch': 'main', 'branch': 'main',
'file': 'comps-f44.xml', 'file': 'comps-f44.xml',
'command': 'make 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: # allow Pungi to tell it what volume ID to use. Note:
# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy # https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
# '-Workstation-' is a temporary workaround. See # '-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 = { volume_id_substitutions = {
'Beta': 'B', 'Beta': 'B',
'Rawhide': 'rawh', 'Rawhide': 'rawh',
@ -183,7 +183,7 @@ volume_id_substitutions = {
'IoT': 'iot', 'IoT': 'iot',
'Jam_KDE': 'Jam', 'Jam_KDE': 'Jam',
'MATE_Compiz': 'MATE', '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',
'Python_Classroom': 'Clss', 'Python_Classroom': 'Clss',
'Robotics': 'Robo', 'Robotics': 'Robo',
@ -203,7 +203,6 @@ translate_paths = [
] ]
# These will be inherited by live_media, live_images and image_build # These will be inherited by live_media, live_images and image_build
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '44' global_version = '44'
# live_images ignores this in favor of live_target # live_images ignores this in favor of live_target
@ -216,10 +215,11 @@ imagebuilder = {
"name": "%s-raw" % release_name, "name": "%s-raw" % release_name,
"types": ["iot-raw-xz"], "types": ["iot-raw-xz"],
"arches": ["x86_64", "aarch64"], "arches": ["x86_64", "aarch64"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], "repos": ["https://kojipkgs.fedoraproject.org/compose/44/Fedora-44-20260422.1/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f44-updates/compose/Everything/$arch/os/"],
"ostree": { "ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/rawhide/$arch/iot", "ref": "fedora/stable/$arch/iot",
}, },
"subvariant": "IoT", "subvariant": "IoT",
"failable": ["*"], "failable": ["*"],
@ -228,10 +228,11 @@ imagebuilder = {
"name": "%s-ostree" % release_name, "name": "%s-ostree" % release_name,
"types": ["iot-installer"], "types": ["iot-installer"],
"arches": ["x86_64", "aarch64"], "arches": ["x86_64", "aarch64"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], "repos": ["https://kojipkgs.fedoraproject.org/compose/44/Fedora-44-20260422.1/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f44-updates/compose/Everything/$arch/os/"],
"ostree": { "ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/rawhide/$arch/iot", "ref": "fedora/stable/$arch/iot",
}, },
"subvariant": "IoT", "subvariant": "IoT",
"manifest_type": "dvd-ostree", "manifest_type": "dvd-ostree",
@ -241,10 +242,11 @@ imagebuilder = {
"name": "%s-provisioner" % release_name, "name": "%s-provisioner" % release_name,
"types": ["iot-simplified-installer"], "types": ["iot-simplified-installer"],
"arches": ["x86_64", "aarch64"], "arches": ["x86_64", "aarch64"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], "repos": ["https://kojipkgs.fedoraproject.org/compose/44/Fedora-44-20260422.1/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f44-updates/compose/Everything/$arch/os/"],
"ostree": { "ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/rawhide/$arch/iot", "ref": "fedora/stable/$arch/iot",
}, },
"blueprint": { "blueprint": {
"customizations": { "customizations": {
@ -264,15 +266,16 @@ ostree = {
"force_new_commit": True, "force_new_commit": True,
"unified_core": True, "unified_core": True,
"treefile": "fedora-iot.yaml", "treefile": "fedora-iot.yaml",
"config_url": "https://pagure.io/fedora-iot/ostree.git", "config_url": "https://forge.fedoraproject.org/iot/ostree.git",
"config_branch": "main", "config_branch": "f44",
"repo": [ "repo": [
"IoT", "IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" "https://kojipkgs.fedoraproject.org/compose/44/Fedora-44-20260422.1/compose/Everything/$basearch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f44-updates/compose/Everything/$basearch/os/"
] ]
"tag_ref": False, "tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/", "ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/iot", "ostree_ref": "fedora/stable/${basearch}/iot",
"runroot_packages": ["selinux-policy-targeted"], "runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64", "aarch64"], "arches": ["x86_64", "aarch64"],
"update_summary": True, "update_summary": True,
@ -283,10 +286,11 @@ ostree_container = {
"^IoT$": [ "^IoT$": [
{ {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "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", "config_branch": "main",
"treefile": "fedora-rawhide.yaml", "treefile": "fedora-44.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "repo": ["https://kojipkgs.fedoraproject.org/compose/44/Fedora-44-20260422.1/compose/Everything/$basearch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f44-updates/compose/Everything/$basearch/os/"],
"arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
"failable": ['*'], "failable": ['*'],
"subvariant": "base", "subvariant": "base",
@ -294,10 +298,11 @@ ostree_container = {
}, },
{ {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "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", "config_branch": "main",
"treefile": "fedora-iot-rawhide.yaml", "treefile": "fedora-iot-44.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], "repo": ["https://kojipkgs.fedoraproject.org/compose/44/Fedora-44-20260422.1/compose/Everything/$basearch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f44-updates/compose/Everything/$basearch/os/"],
"arches": ["x86_64", "aarch64"], "arches": ["x86_64", "aarch64"],
"failable": ['*'], "failable": ['*'],
"name": "Fedora-IoT-bootc", "name": "Fedora-IoT-bootc",

View file

@ -30,20 +30,20 @@ if [ -d releng ]; then
git pull --rebase git pull --rebase
popd popd
else else
git clone https://pagure.io/releng.git git clone https://forge.fedoraproject.org/releng/tooling.git releng
fi fi
# Set up our fedmsg function, using the releng repo definition # Set up our fedmsg function, using the releng repo definition
#FEDMSG_MODNAME="compose" #FEDMSG_MODNAME="compose"
#FEDMSG_CERTPREFIX="releng" #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.. # 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") #fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
#send_fedmsg "${fedmsg_json_start}" ${RELEASE} start #send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
#pushd $TMPDIR #pushd $TMPDIR
#git clone https://pagure.io/fedora-comps.git && { #git clone https://forge.fedoraproject.org/releng/fedora-comps.git && {
# pushd fedora-comps # pushd fedora-comps
# make "${COMPSFILE}" # make "${COMPSFILE}"
# cp "${COMPSFILE}" $DEST/ # cp "${COMPSFILE}" $DEST/
@ -67,7 +67,7 @@ fi
NEWCOMPOSE_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') 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 # Set this to use later for a few items include depcheck
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID

View file

@ -47,9 +47,9 @@ arch_to_goarch() {
# This is the release of Fedora that is currently stable, it will define if we # This is the release of Fedora that is currently stable, it will define if we
# need to move the fedora:latest tag # need to move the fedora:latest tag
current_stable="41" current_stable="44"
# Define what is rawhide so we know to push that tag # Define what is rawhide so we know to push that tag
current_rawhide="43" current_rawhide="45"
# Sanity checking # Sanity checking
if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; if ! [[ "${1}" =~ ^-?[0-9]+$ ]];
then then

View file

@ -18,7 +18,7 @@ TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org" TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <rawhide@fedoraproject.org>" FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync" 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) OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
# assume a releng dir is a git checkout of the releng repo # assume a releng dir is a git checkout of the releng repo
@ -28,13 +28,13 @@ if [ -d releng ]; then
git pull --rebase git pull --rebase
popd popd
else else
git clone https://pagure.io/releng.git git clone https://forge.fedoraproject.org/releng/tooling.git releng
fi fi
# Set up our fedmsg function, using the releng repo definition # 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_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
FEDMSG_MODNAME="compose" FEDMSG_MODNAME="compose"
FEDMSG_CERTPREFIX="releng" FEDMSG_CERTPREFIX="releng"
. ./releng/scripts_new/infrastructure/messaging/fedora_messaging.sh . ./releng/infrastructure/messaging/fedora_messaging.sh
# Announce that we are starting... # Announce that we are starting...
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start 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" 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) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') 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 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
# Public URL the synced compose will wind up at, we put it in fedmsgs # 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 ; for dir in IoT metadata ;
do do
$RSYNCPREFIX rsync -avhH --delete-after $DESTDIR/compose/$dir/ "$RSYNCTARGET/$dir/" ; $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 done
# Tell everyone by fedmsg about the compose # Tell everyone by fedmsg about the compose
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete