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

Remove IoT, only compose fedora-bootc container #154

Merged
pwhalen merged 1 commit from bootc-only into f42 2025-10-27 15:28:31 +00:00
Conversation 2 Commits 1 Files changed 2 +2 -88
2 changed files with 2 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

86
fedora-iot.conf
View file

@ -87,13 +87,6 @@ lorax_options = [
})
]
additional_packages = [
('^IoT$$', {
'*': [
'*',
],
}),
]
multilib = [
('^Everything$', {
'x86_64': ['devel', 'runtime'],
@ -209,74 +202,6 @@ 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/42/Fedora-42-20250409.0/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"],
"ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ostree_ref": "fedora/stable/$arch/iot",
"subvariant": "IoT",
"failable": ["*"]
},
{
"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/42/Fedora-42-20250409.0/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"],
"ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ostree_ref": "fedora/stable/$arch/iot",
"subvariant": "IoT",
"failable": ["*"]
"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/42/Fedora-42-20250409.0/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/"],
"ostree_url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ostree_ref": "fedora/stable/$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": "f42",
"repo": [
"IoT",
"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/"],
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/stable/${basearch}/iot",
"runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64", "aarch64"],
"update_summary": True,
}
}
ostree_container = {
"^IoT$": [
{
@ -291,17 +216,6 @@ ostree_container = {
"subvariant": "base",
"name": "Fedora-base-bootc",
},
{
"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-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"],
"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="42"
current_stable="43"
# Define what is rawhide so we know to push that tag
current_rawhide="43"
current_rawhide="44"
# Sanity checking
if ! [[ "${1}" =~ ^-?[0-9]+$ ]];
then