diff --git a/fedora-iot.conf b/fedora-iot.conf index ade2977..a3a3c10 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,9 +1,9 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '43' +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 f43 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-f43.xml', - 'command': 'make comps-f43.xml' + 'file': 'comps-f46.xml', + 'command': 'make comps-f46.xml' } variants_file='variants-fedora.xml' -sigkeys = ['31645531'] +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 = 'f43-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 = 'f43-iot' +pkgset_koji_tag = 'f46-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -87,6 +87,13 @@ lorax_options = [ }) ] +additional_packages = [ + ('^IoT$$', { + '*': [ + '*', + ], + }), +] multilib = [ ('^Everything$', { 'x86_64': ['devel', 'runtime'], @@ -195,11 +202,80 @@ 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 = '43' -# live_images ignores this in favor of live_target -global_target = 'f43' +global_version = '46' +global_target = 'f46' + +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/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], + "ostree": { + "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", + "ref": "fedora/rawhide/$arch/iot", + }, + "subvariant": "IoT", + "failable": ["*"], + }, + { + "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/"], + "ostree": { + "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", + "ref": "fedora/rawhide/$arch/iot", + }, + "subvariant": "IoT", + "manifest_type": "dvd-ostree", + "failable": ["*"], + }, + { + "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/"], + "ostree": { + "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", + "ref": "fedora/rawhide/$arch/iot", + }, + "blueprint": { + "customizations": { + "installation_device": "/dev/vda1", + }, + }, + "subvariant": "IoT_Simplified_Provisioner", + "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://forge.fedoraproject.org/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 = { "^IoT$": [ @@ -207,14 +283,23 @@ 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-43.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/43/Fedora-43-20251023.0/compose/Everything/$basearch/os/", - "https://kojipkgs.fedoraproject.org/compose/updates/f43-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", "name": "Fedora-base-bootc", }, + { + "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-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", + }, ] } diff --git a/nightly.sh b/nightly.sh index 6896aa7..fa8dfcb 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.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 " diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 21b6652..ebab8ee 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -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="43" +current_stable="44" # Define what is rawhide so we know to push that tag -current_rawhide="44" +current_rawhide="46" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then diff --git a/sync-release.sh b/sync-release.sh index 0999c92..5badf8c 100755 --- a/sync-release.sh +++ b/sync-release.sh @@ -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="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.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 " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/43/" +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) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index a7b2bdb..c0925c7 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -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="43" -RELEASE_TITLE="43" -COMPSFILE="comps-f43.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 " 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