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

Compare commits

merge into: iot:main
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
...
pull from: iot:f42
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
Sign in to create a new pull request.

10 commits
main ... f42

Author SHA1 Message Date
Paul Whalen
02a4a8f402 Remove IoT, only compose fedora-bootc container 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-10-23 15:33:57 -04:00
Anton Medvedev
706c0f4a3d ref: fix path effected by releng repo refactoring 
Signed-off-by: Anton Medvedev <amedvede@redhat.com>
 2025-10-07 21:51:36 +02:00
Paul Whalen
86fe5a11ac F42: Stop running the container sync script, replaced by cloud-image-uploader 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-04-29 09:37:44 -04:00
Paul Whalen
e966d05e19 F42: Fix container names to reflect content in the image 
This fixes the container names to reflect the content in the image.
Fedora-IoT-bootc - iot image
Fedora-base-bootc - generic base image

Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-04-25 17:13:28 -04:00
Paul Whalen
1df1af174b Build bootc images in IoT variant, tweak subvariants and names 
See:
https://pagure.io/fedora-iot/pungi-iot/pull-request/102
https://pagure.io/fedora-iot/pungi-iot/pull-request/138

Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-04-24 15:02:45 -04:00
Paul Whalen
04262754cf Enable updates repo for Fedora 42 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-04-22 09:16:45 -04:00
Paul Whalen
f9ca24002c F42: Update for final 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-04-10 15:03:26 -04:00
Paul Whalen
3a39253ac3 Make f42 osbuild deliverables failable due to koji network issues 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-02-10 10:39:35 -05:00
Paul Whalen
fe4902974d F-42: containers should use main 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-02-05 15:23:27 -05:00
Paul Whalen
4a5226f144 F-42: Update for branching 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
 2025-02-05 11:28:28 -05:00
5 changed files with 20 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

104
fedora-iot.conf
View file

@ -22,7 +22,7 @@ sigkeys = ['105ef944']
tree_arches = ['aarch64', 'x86_64', "ppc64le", "s390x"]
# limit tree variants
# if undefined, all variants from variants.xml will be included
tree_variants = ['IoT', 'bootc', 'bootc-base']
tree_variants = ['IoT']
hashed_directories = True
# RUNROOT settings
@ -87,13 +87,6 @@ lorax_options = [
})
]
additional_packages = [
('^IoT$$', {
'*': [
'*',
],
}),
]
multilib = [
('^Everything$', {
'x86_64': ['devel', 'runtime'],
@ -209,88 +202,21 @@ global_version = '42'
# live_images ignores this in favor of live_target
global_target = 'f42'
osbuild = {
"^IoT$": [
{
"name": "%s-raw" % release_name,
"distro": "fedora-42",
"image_types": ["iot-raw-image"],
"target": "f%s-candidate" % release_version,
"arches": ["x86_64", "aarch64"],
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ostree_ref": "fedora/rawhide/$arch/iot",
"subvariant": "IoT",
},
{
"name": "%s-ostree" % release_name,
"distro": "fedora-42",
"image_types": ["iot-installer"],
"target": "f%s-candidate" % release_version,
"arches": ["x86_64", "aarch64"],
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ostree_ref": "fedora/rawhide/$arch/iot",
"subvariant": "IoT",
"manifest_type": "dvd-ostree",
},
{
"name": "%s-provisioner" % release_name,
"distro": "fedora-42",
"image_types": ["iot-simplified-installer"],
"target": "f%s-candidate" % release_version,
"arches": ["x86_64", "aarch64"],
"repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
"ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ostree_ref": "fedora/rawhide/$arch/iot",
"subvariant": "IoT_Simplified_Provisioner",
"customizations": {"installation_device": "/dev/vda"},
"failable": ["*"],
"manifest_type": "dvd-ostree",
},
],
}
ostree = {
"^IoT$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True,
"unified_core": True,
"treefile": "fedora-iot.yaml",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "main",
"repo": [
"IoT",
"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/rawhide/${basearch}/iot",
"runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64", "aarch64"],
"update_summary": True,
}
}
ostree_container = {
"^bootc$": {
"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/"],
"arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
"failable": ['*'],
},
"^bootc-base$": {
"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/"],
"arches": ["x86_64", "aarch64"],
"failable": ['*'],
},
"^IoT$": [
{
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"config_url": "https://pagure.io/fedora-iot/base-images",
"config_branch": "main",
"treefile": "fedora-42.yaml",
"repo": ["https://kojipkgs.fedoraproject.org/compose/42/Fedora-42-20250409.0/compose/Everything/$basearch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$basearch/os/"],
"arches": ["x86_64", "aarch64", "ppc64le", "s390x"],
"failable": ['*'],
"subvariant": "base",
"name": "Fedora-base-bootc",
},
]
}
koji_profile = 'compose_koji'

2
nightly.sh
View file

@ -36,7 +36,7 @@ fi
# Set up our fedmsg function, using the releng repo definition
#FEDMSG_MODNAME="compose"
#FEDMSG_CERTPREFIX="releng"
. ./releng/scripts/fedmsg-functions.sh
. ./releng/scripts_new/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")

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="42"
current_rawhide="44"
# Sanity checking
if ! [[ "${1}" =~ ^-?[0-9]+$ ]];
then

8
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
@ -34,7 +34,7 @@ fi
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
FEDMSG_MODNAME="compose"
FEDMSG_CERTPREFIX="releng"
. ./releng/scripts/fedmsg-functions.sh
. ./releng/scripts_new/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"
@ -69,10 +69,6 @@ for dir in IoT metadata ;
$RSYNCPREFIX rsync -avhH --delete-after $DESTDIR/compose/$dir/ "$RSYNCTARGET/$dir/" ;
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
done
# Push containers
./sync-bootc-base-containers.sh ${RELEASE} ${LABEL}
# Tell interested persons that the rsync is done.
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
# Tell everyone by fedmsg about the compose
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'

12
variants-fedora.xml
View file

@ -2,18 +2,6 @@
<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
<variants>
<variant id="IoT" name="IoT" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>x86_64</arch>
</arches>
</variant>
<variant id="bootc-base" name="bootc-base" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>x86_64</arch>
</arches>
</variant>
<variant id="bootc" name="bootc" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>x86_64</arch>