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

Compare commits

base: iot:f44
Branches Tags
iot:main
iot:f45
iot:f43
iot:f44
iot:f44-enable-updates
iot:master
iot:f43-bootc-only
iot:f44-stable
iot:f42
iot:f41
iot:f40
iot:f39
iot:f38
iot:f36
iot:f37
iot:f35
iot:f34
iot:f33
iot:f32
iot:f31
iot:f30
iot:f29
iot:f28
..
compare: iot:main
Branches Tags
iot:f45
iot:main
iot:f43
iot:f44
iot:f44-enable-updates
iot:master
iot:f43-bootc-only
iot:f44-stable
iot:f42
iot:f41
iot:f40
iot:f39
iot:f38
iot:f36
iot:f37
iot:f35
iot:f34
iot:f33
iot:f32
iot:f31
iot:f30
iot:f29
iot:f28

6 commits
f44 ... main

Author SHA1 Message Date
Paul Whalen
3d9cd16f82 Bump rawhide to Fedora 46 2026-08-12 10:17:54 -04:00
Paul Whalen
e8f17b68c4 Update releng script paths for tooling repo restructure 
- nightly.sh: Update fedora_messaging.sh path (scripts_new/ → no prefix)
- nightly.sh: Update build_composeinfo path (scripts/ → builds/compose/)
- twoweek-nightly.sh: Update fedora_messaging.sh path (scripts_new/ → no prefix)
- twoweek-nightly.sh: Update build_composeinfo path (scripts/ → builds/compose/)

Assisted-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2026-07-29 10:51:09 -04:00
Paul Whalen
5fe5764dba Update Pagure URLs to Forge for IoT compose 
- fedora-iot.conf: Update comps_file, ostree, and ostree_container config_urls
  to forge.fedoraproject.org (fedora-comps, ostree, base-images, fedora-iot-bootc)
- fedora-iot.conf: Update pungi-fedora PR/issue comment links
- nightly.sh: Update releng and fedora-comps clone URLs
- twoweek-nightly.sh: Update releng clone URL

Assisted-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2026-07-28 16:01:37 -04:00
Adam Williamson
4186f8b817 Restore global_release, global_version, global_target 
It's not entirely obvious, but these were not in fact tied to the
old livemedia phase as 087fe9f thought; they are used by modern
phases like imagebuilder and kiwi as well. Restore them, with a
less misleading comment.

Fixes: https://github.com/fedora-iot/iot-distro/issues/131
Signed-off-by: Adam Williamson <awilliam@redhat.com>
 2026-04-27 23:48:51 -07:00
Paul Whalen
087fe9f286 fix: fedora-kickstarts retired 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2026-02-06 15:13:08 -05:00
Paul Whalen
96a8f98dc4 F-45: Update for branching 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2026-02-06 13:12:22 -05:00
5 changed files with 36 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

55
fedora-iot.conf
View file

@ -1,9 +1,9 @@
# PRODUCT INFO
release_name = 'Fedora-IoT'
release_short = 'Fedora-IoT'
release_version = '44'
release_version = '46'
# Let's not build install media during this run. For the image builds
# and OSTree installer we'll use inputs from other f44 runs.
# and OSTree installer we'll use inputs from other f45 runs.
skip_phases = ["buildinstall", "createrepo", "extra_files"]
# GENERAL SETTINGS
@ -11,11 +11,11 @@ comps_file = {
'scm': 'git',
'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git',
'branch': 'main',
'file': 'comps-f44.xml',
'command': 'make comps-f44.xml'
'file': 'comps-f46.xml',
'command': 'make comps-f46.xml'
}
variants_file='variants-fedora.xml'
sigkeys = ['6D9F90A6']
sigkeys = ['91211FCE']
# limit tree architectures
# if undefined, all architectures from variants.xml will be included
@ -27,7 +27,7 @@ hashed_directories = True
# RUNROOT settings
runroot_channel = 'compose'
runroot_tag = 'f44-build'
runroot_tag = 'f46-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos
# pkgset_repos = {}
# PKGSET - KOJI
pkgset_koji_tag = 'f44-iot'
pkgset_koji_tag = 'f46-iot'
pkgset_koji_inherit = False
filter_system_release_packages = False
@ -202,24 +202,22 @@ translate_paths = [
('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
]
# These will be inherited by live_media, live_images and image_build
# These may be inherited by various phases for creating Koji tasks
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '44'
# live_images ignores this in favor of live_target
global_target = 'f44'
global_version = '46'
global_target = 'f46'
imagebuilder_target = 'f44-image-builder'
imagebuilder_target = 'f46-image-builder'
imagebuilder = {
"^IoT$": [
{
"name": "%s-raw" % release_name,
"types": ["iot-raw-xz"],
"arches": ["x86_64", "aarch64"],
"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/"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/stable/$arch/iot",
"ref": "fedora/rawhide/$arch/iot",
},
"subvariant": "IoT",
"failable": ["*"],
@ -228,11 +226,10 @@ imagebuilder = {
"name": "%s-ostree" % release_name,
"types": ["iot-installer"],
"arches": ["x86_64", "aarch64"],
"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/"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/stable/$arch/iot",
"ref": "fedora/rawhide/$arch/iot",
},
"subvariant": "IoT",
"manifest_type": "dvd-ostree",
@ -242,11 +239,10 @@ imagebuilder = {
"name": "%s-provisioner" % release_name,
"types": ["iot-simplified-installer"],
"arches": ["x86_64", "aarch64"],
"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/"],
"repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"ostree": {
"url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ref": "fedora/stable/$arch/iot",
"ref": "fedora/rawhide/$arch/iot",
},
"blueprint": {
"customizations": {
@ -267,15 +263,14 @@ ostree = {
"unified_core": True,
"treefile": "fedora-iot.yaml",
"config_url": "https://forge.fedoraproject.org/iot/ostree.git",
"config_branch": "f44",
"config_branch": "main",
"repo": [
"IoT",
"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/"
"https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/stable/${basearch}/iot",
"ostree_ref": "fedora/rawhide/${basearch}/iot",
"runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64", "aarch64"],
"update_summary": True,
@ -288,9 +283,8 @@ ostree_container = {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"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/",
"https://kojipkgs.fedoraproject.org/compose/updates/f44-updates/compose/Everything/$basearch/os/"],
"treefile": "fedora-rawhide.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
"arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
"failable": ['*'],
"subvariant": "base",
@ -300,9 +294,8 @@ ostree_container = {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"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/",
"https://kojipkgs.fedoraproject.org/compose/updates/f44-updates/compose/Everything/$basearch/os/"],
"treefile": "fedora-iot-rawhide.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"],
"arches": ["x86_64", "aarch64"],
"failable": ['*'],
"name": "Fedora-IoT-bootc",

6
nightly.sh
View file

@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg"
DEST=$(pwd)
DATE=$(date "+%Y%m%d")
SHORT="Fedora-IoT"
RELEASE="44"
RELEASE_TITLE="44"
COMPSFILE="comps-f44.xml"
RELEASE="46"
RELEASE_TITLE="46"
COMPSFILE="comps-f46.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <rawhide@fedoraproject.org>"

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

@ -49,7 +49,7 @@ arch_to_goarch() {
# need to move the fedora:latest tag
current_stable="44"
# Define what is rawhide so we know to push that tag
current_rawhide="45"
current_rawhide="46"
# Sanity checking
if ! [[ "${1}" =~ ^-?[0-9]+$ ]];
then

8
sync-release.sh
View file

@ -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="44"
RELEASE_TITLE="44"
COMPSFILE="comps-f44.xml"
RELEASE="46"
RELEASE_TITLE="46"
COMPSFILE="comps-f46.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="iot@lists.fedoraproject.org"
FROM="Fedora IoT Report <branched@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
RSYNCTARGET="/pub/alt/iot/44/"
RSYNCTARGET="/pub/alt/iot/46/"
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)

8
twoweek-nightly.sh
View file

@ -11,14 +11,14 @@ DEST=$(pwd)
DATE=$(date "+%Y%m%d")
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
SHORT="Fedora-IoT"
RELEASE="44"
RELEASE_TITLE="44"
COMPSFILE="comps-f44.xml"
RELEASE="46"
RELEASE_TITLE="46"
COMPSFILE="comps-f46.xml"
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/branched/"
RSYNCTARGET="/pub/alt/iot/rawhide/"
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
# assume a releng dir is a git checkout of the releng repo