iot/pungi-iot
0
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

F-44: Update for branching #159

Merged
pwhalen merged 1 commit from f44-branching into f44 2026-02-06 18:31:16 +00:00
Conversation 3 Commits 1 Files changed 3 +17 -17
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
fedora-iot.conf
View file

@ -203,7 +203,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/f44'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '44'
# live_images ignores this in favor of live_target
@ -216,10 +216,10 @@ imagebuilder = {
"name": "%s-raw" % release_name,
"types": ["iot-raw-xz"],
"arches": ["x86_64", "aarch64"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-44/compose/Everything/$arch/os/"],
"ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/rawhide/$arch/iot",
"ref": "fedora/devel/$arch/iot",
},
"subvariant": "IoT",
"failable": ["*"],
@ -228,10 +228,10 @@ imagebuilder = {
"name": "%s-ostree" % release_name,
"types": ["iot-installer"],
"arches": ["x86_64", "aarch64"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-44/compose/Everything/$arch/os/"],
"ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/rawhide/$arch/iot",
"ref": "fedora/devel/$arch/iot",
},
"subvariant": "IoT",
"manifest_type": "dvd-ostree",
@ -241,10 +241,10 @@ imagebuilder = {
"name": "%s-provisioner" % release_name,
"types": ["iot-simplified-installer"],
"arches": ["x86_64", "aarch64"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-44/compose/Everything/$arch/os/"],
"ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/rawhide/$arch/iot",
"ref": "fedora/devel/$arch/iot",
},
"blueprint": {
"customizations": {
@ -265,14 +265,14 @@ ostree = {
"unified_core": True,
"treefile": "fedora-iot.yaml",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "main",
"config_branch": "f44",
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
"https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-44/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",
"runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64", "aarch64"],
"update_summary": True,
@ -285,8 +285,8 @@ ostree_container = {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"config_url": "https://pagure.io/fedora-iot/base-images",
"config_branch": "main",
"treefile": "fedora-rawhide.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
"treefile": "fedora-44.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-44/compose/Everything/$basearch/os/"],
"arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
"failable": ['*'],
"subvariant": "base",
@ -296,8 +296,8 @@ ostree_container = {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"config_url": "https://pagure.io/fedora-iot/fedora-iot-bootc.git",
"config_branch": "main",
"treefile": "fedora-iot-rawhide.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
"treefile": "fedora-iot-44.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-44/compose/Everything/$basearch/os/"],
"arches": ["x86_64", "aarch64"],
"failable": ['*'],
"name": "Fedora-IoT-bootc",

4
sync-bootc-base-containers.sh
View file

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

2
twoweek-nightly.sh
View file

@ -18,7 +18,7 @@ TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <rawhide@fedoraproject.org>"
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