PR#1341: EPEL 10 nightly compose - pungi-fedora

pungi-fedora

#1341 EPEL 10 nightly compose

Merged 7 months ago by kevin. Opened 8 months ago by carlwgeorge.

carlwgeorge/pungi-fedora epel10-init into epel10

EPEL 10 nightly compose

Carl George • 7 months ago

26c5bb6

Remove files that won't be used for the EPEL 10 nightly compose

Carl George • 7 months ago

024d723

README.rst

file removed

-2

		`@@ -1,2 +0,0 @@`
		`- This repo holds the config files that define what goes in and comes`
		`- out of a Fedora compose using pungi.`

cloud-nightly.sh

file removed

-93

		`@@ -1,93 +0,0 @@`
		`- #!/bin/sh`
		`- #set -x`
		`- export LC_ALL=C`
		`- LABEL=$1`
		`- # Remove the label from arguments. It gets special treatment. Other arguments`
		`- # to the script are passed to pungi-koji directly.`
		`- shift`
		`- CONFIG="fedora-cloud.conf"`
		`- TARGET_DIR="/mnt/koji/compose/cloud"`
		`- MD_ARCHIVE_DIR="/mnt/koji/compose/metadata-archive"`
		`- SERIES_DIR="${MD_ARCHIVE_DIR}/series"`
		`- #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"`
		`- NIGHTLY=""`
		`- DEST=$(pwd)`
		`- DATE=$(date "+%Y%m%d")`
		`- # the Pungi 'shortname', which we will include in fedmsgs for disambiguation`
		`- SHORT="Fedora-Cloud"`
		`- RELEASE="42"`
		`- RELEASE_TITLE="42"`
		`- COMPSFILE="comps-f42.xml"`
		- TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
		`- TOMAIL="test-reports@lists.fedoraproject.org"`
		`- FROM="Fedora Branched Report <rawhide@fedoraproject.org>"`
		`- RSYNCPREFIX="sudo -u ftpsync"`
		`- OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)`
		`- # uncomment and edit for resuming a failed compose`
		`- #COMPOSE_ID="Fedora-23-20150530.n.0"`
		`- # assume a releng dir is a git checkout of the releng repo`
		`- # if it does not exist clone it`
		`- if [ -d releng ]; then`
		`- pushd releng`
		`- git pull --rebase`
		`- popd`
		`- else`
		`- git clone https://pagure.io/releng.git`
		`- fi`
		`- # Set up our fedmsg function, using the releng repo definition`
		`- 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`
		`- # Announce that we are starting, even though we don't know the compose_id yet..`
		`- send_fedmsg "${fedmsg_json_start}" ${RELEASE} start`
		`- CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"`
		`- if [ -z "$COMPOSE_ID" ]; then`
		`- CMD="$CMD --target-dir=$TARGET_DIR"`
		`- else`
		`- CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"`
		`- fi`
		`- time $CMD "$@"`
		`- if [ "$?" != "0" ]; then`
		`- exit 1`
		`- fi`
		`-`
		`- NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)`
		`- SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID\|sed -e 's\|Fedora-.*-\|\|g')`
		`-`
		`- # Set this to use later for a few items include depcheck`
		`- DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID`
		`- # Public URL the compose will wind up at, we put it in fedmsgs`
		`- LOCATION=$(echo $DESTDIR\|sed -e 's,/mnt/koji,https://kojipkgs.fedoraproject.org,g')`
		`- # Update fedmsg template`
		`- fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")`
		`- fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")`
		`-`
		`- $RSYNCPREFIX mkdir -p $DESTDIR`
		`- # Tell interested persons that the rsync is starting (zomg!)`
		`- #send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start`
		`- #for dir in CloudImage metadata ;`
		`- # do`
		`- # $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;`
		`- # done`
		`- # 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`
		`- # Tell everyone by email about the compose`
		`- SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'`
		`- #for tomail in $TOMAIL ; do`
		`- # cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck \| \`
		`- # mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail`
		`- #done`
		`-`
		`- # Copy the metadata to the non-garbage-collected metadata archive`
		`- YEAR=$(echo "${SHORTCOMPOSE_ID}" \| cut -c1-4)`
		`- mkdir -p "${MD_ARCHIVE_DIR}/${YEAR}/${NEWCOMPOSE_ID}"`
		`- cp "${DESTDIR}"/compose/metadata/*.json "${MD_ARCHIVE_DIR}/${YEAR}/${NEWCOMPOSE_ID}/"`
		`- # Add the compose ID to the 'series' file which records the`
		`- # compose IDs for each SHORT name in order`
		`- mkdir -p "${SERIES_DIR}"`
		`- echo "${NEWCOMPOSE_ID}" >> "${SERIES_DIR}/${SHORT}-${RELEASE}"`
		`-`
		`- find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;`

container-nightly.sh

file removed

-101

		`@@ -1,101 +0,0 @@`
		`- #!/bin/sh`
		`- export LC_ALL=C`
		`- LABEL=$1`
		`- # Remove the label from arguments. It gets special treatment. Other arguments`
		`- # to the script are passed to pungi-koji directly.`
		`- shift`
		`- CONFIG="fedora-container.conf"`
		`- TARGET_DIR="/mnt/koji/compose/container"`
		`- MD_ARCHIVE_DIR="/mnt/koji/compose/metadata-archive"`
		`- SERIES_DIR="${MD_ARCHIVE_DIR}/series"`
		`- #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"`
		`- NIGHTLY=""`
		`- DEST=$(pwd)`
		`- DATE=$(date "+%Y%m%d")`
		`- # the Pungi 'shortname', which we will include in fedmsgs for disambiguation`
		`- SHORT="Fedora-Docker"`
		`- RELEASE="42"`
		`- RELEASE_TITLE="42"`
		`- COMPSFILE="comps-f42.xml"`
		- TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
		`- TOMAIL="test-reports@lists.fedoraproject.org"`
		`- FROM="Fedora Branched Report <rawhide@fedoraproject.org>"`
		`- RSYNCPREFIX="sudo -u ftpsync"`
		`- OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)`
		`- # uncomment and edit for resuming a failed compose`
		`- #COMPOSE_ID="Fedora-23-20150530.n.0"`
		`- # assume a releng dir is a git checkout of teh releng repo`
		`- # if it does not exist clone it`
		`- if [ -d releng ]; then`
		`- pushd releng`
		`- git pull --rebase`
		`- popd`
		`- else`
		`- git clone https://pagure.io/releng.git`
		`- fi`
		`- # Set up our fedmsg function, using the releng repo definition`
		`- 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`
		`- # Announce that we are starting...`
		`- send_fedmsg "${fedmsg_json_start}" ${RELEASE} start`
		`- CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"`
		`- if [ -z "$COMPOSE_ID" ]; then`
		`- CMD="$CMD --target-dir=$TARGET_DIR"`
		`- else`
		`- CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"`
		`- fi`
		`- time $CMD "$@"`
		`- if [ "$?" != "0" ]; then`
		`- exit 1`
		`- fi`
		`-`
		`- NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)`
		`- SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID\|sed -e 's\|Fedora-.*-\|\|g')`
		`-`
		`- # Set this to use later for a few items include depcheck`
		`- DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID`
		`- # Public URL the compose will wind up at, we put it in fedmsgs`
		`- LOCATION=$(echo $DESTDIR\|sed -e 's,/mnt/koji,https://kojipkgs.fedoraproject.org,g')`
		`- # Update fedmsg template`
		`- fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")`
		`- fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")`
		`-`
		`- $RSYNCPREFIX mkdir -p $DESTDIR`
		`- # Tell interested persons that the rsync is starting (zomg!)`
		`- #send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start`
		`- #for dir in Docker metadata ;`
		`- # do`
		`- # $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;`
		`- # done`
		`- # 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'`
		`- #for tomail in $TOMAIL ; do`
		`- # cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck \| \`
		`- # mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail`
		`- #done`
		`-`
		`- pushd ./releng`
		`- pushd ./scripts`
		`- # Publish OCI container images we just built to Fedora and Quay registries`
		`- ./sync-latest-container-base-image.sh $RELEASE`
		`- # Also convert latest Atomic Desktop ostrees to OCIs and publish those, even`
		`- # though this script does not build them (because Bodhi cannot do this itself)`
		`- ./sync-ostree-base-containers.sh $RELEASE`
		`- popd`
		`- popd`
		`-`
		`- # Copy the metadata to the non-garbage-collected metadata archive`
		`- YEAR=$(echo "${SHORTCOMPOSE_ID}" \| cut -c1-4)`
		`- mkdir -p "${MD_ARCHIVE_DIR}/${YEAR}/${NEWCOMPOSE_ID}"`
		`- cp "${DESTDIR}"/compose/metadata/*.json "${MD_ARCHIVE_DIR}/${YEAR}/${NEWCOMPOSE_ID}/"`
		`- # Add the compose ID to the 'series' file which records the`
		`- # compose IDs for each SHORT name in order`
		`- mkdir -p "${SERIES_DIR}"`
		`- echo "${NEWCOMPOSE_ID}" >> "${SERIES_DIR}/${SHORT}-${RELEASE}"`
		`-`
		`- find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;`

create-candidate-configs.py

file removed

-68

		`@@ -1,68 +0,0 @@`
		`- #!/usr/bin/python3`
		`-`
		`- import argparse`
		`-`
		`- parser = argparse.ArgumentParser(`
		`- description=(`
		`- "Script for generating Fedora Beta and Final Pungi configs."`
		`- )`
		`- )`
		`- parser.add_argument(`
		`- "milestone",`
		`- help="The milestone whose config to generate",`
		`- choices=("beta", "final"),`
		`- )`
		`-`
		`- parser.add_argument(`
		`- "--major",`
		`- help="The major release number",`
		`- type=int,`
		`- default=1`
		`- )`
		`-`
		`- parser.add_argument(`
		`- "--minor",`
		`- help="The minor release number",`
		`- type=int,`
		`- default=1`
		`- )`
		`-`
		`- args = parser.parse_args()`
		`-`
		`- with open("fedora.conf", "r", encoding="utf-8") as nightlyfh:`
		`- nightly = nightlyfh.read().splitlines()`
		`-`
		`- out = []`
		`- rel = ""`
		`- for line in nightly:`
		`- if line.strip().startswith("pkgset_koji_tag"):`
		`- # this is useful to know later`
		`- rel = line.split("=")[1].strip().replace("'", "")`
		`- shortrel = rel.replace("f", "")`
		`- line = line.replace(rel, f"{rel}-compose")`
		`- if line.strip().startswith("pkgset_koji_inherit"):`
		`- line = line.replace("False", "True")`
		`- if line.strip().startswith("media_checksum_base_filename"):`
		`- if args.milestone == "beta":`
		`- line = "media_checksum_base_filename = '%(release_short)s-%(variant)s-%(dirname)s-%(version)s_%(label)s-%(arch)s'"`
		`- else:`
		`- line = f"media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-{args.major}.{args.minor}-%(arch)s'"`
		`- if line.strip().startswith("image_name_format"):`
		`- if args.milestone == "beta":`
		`- line = "image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s_%(label)s.iso'"`
		`- else:`
		`- line = f"image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-{args.major}.{args.minor}.iso'"`
		`- if line.strip().startswith("global_release"):`
		`- line = f"global_release = '{args.major}.{args.minor}'"`
		`- if line.strip().startswith("global_version") and args.milestone == "beta":`
		`- if not shortrel:`
		`- sys.exit("We should've figured out shortrel by now!")`
		`- line = line.replace(shortrel, f"{shortrel}_Beta")`
		`- if line.strip().startswith("'template_branch'"):`
		`- if not rel:`
		`- sys.exit("We should've figured out rel by now!")`
		`- line = line.replace("main", rel)`
		`- out.append(line)`
		`-`
		`- with open(f"fedora-{args.milestone}.conf", "w", encoding="utf-8") as outfh:`
		`- outfh.write("\n".join(out) + "\n")`

epel.conf

file added

+53

		`@@ -0,0 +1,53 @@`
		`+ # RELEASE`
		`+ release_name = 'Fedora-EPEL'`
		`+ release_short = 'Fedora-EPEL'`
		`+ release_version = '10'`
		`+`
		`+ # GENERAL SETTINGS`
		`+ comps_file = {`
		`+ 'scm': 'git',`
		`+ 'repo': 'https://pagure.io/fedora-comps.git',`
		`+ 'branch': 'main',`
		`+ 'file': 'comps-epel10.xml',`
		`+ 'command': 'make comps-epel10.xml',`
		`+ }`
		`+ variants_file='variants.xml'`
		`+`
		`+ # CREATEREPO`
		`+ createrepo_num_workers = 10`
		`+ createrepo_extra_args = ['--general-compress-type', 'gz']`
		`+`
		`+ # PKGSET`
		`+ sigkeys = ['e37ed158']`
		`+ pkgset_source = 'koji'`
		`+ pkgset_koji_tag = 'epel10.0'`
		`+ pkgset_koji_inherit = False`
		`+`
		`+ # GATHER`
		`+ gather_method = {`
		`+ '^.*': { # For all variants`
		`+ 'comps': 'deps', # resolve dependencies for packages from comps file`
		`+ }`
		`+ }`
		`+ greedy_method = 'build'`
		`+ additional_packages = [`
		`+ ('^Everything$', {`
		`+ '*': [`
		`+ '*',`
		`+ ],`
		`+ }),`
		`+ ]`
		`+ filter_system_release_packages = False`
		`+ hashed_directories = True`
		`+ check_deps = False`
		`+`
		`+ # KOJI`
		`+ koji_profile = 'compose_koji'`
		`+ runroot_method = 'koji'`
		`+ runroot_channel = 'compose'`
		`+ runroot_tag = 'epel10.0-build'`
		`+`
		`+ # TRANSLATE PATHS`
		`+ translate_paths = [`
		`+ ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),`
		`+ ]`

fedora-cloud.conf

file removed

-229

		`@@ -1,229 +0,0 @@`
		`- # Import general configuration from general.conf`
		`- from general import *`
		`- # Import multilib configuration from multilib.conf`
		`- from multilib import *`
		`-`
		`- # PRODUCT INFO`
		`- release_name = 'Fedora-Cloud'`
		`- release_short = 'Fedora-Cloud'`
		`- release_version = '42'`
		`- skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]`
		`- # GENERAL SETTINGS`
		`- comps_file = {`
		`- 'scm': 'git',`
		`- 'repo': 'https://pagure.io/fedora-comps.git',`
		`- 'branch': 'main',`
		`- 'file': 'comps-f42.xml',`
		`- 'command': 'make comps-f42.xml'`
		`- }`
		`- variants_file='variants-fedora.xml'`
		`- sigkeys = ['105ef944'] # None = unsigned`
		`-`
		`- # limit tree variants`
		`- # if undefined, all variants from variants.xml will be included`
		`- tree_variants = ['Cloud']`
		`- # PKGSET`
		`- pkgset_koji_tag = 'f42-updates'`
		`- pkgset_koji_inherit = True`
		`- # GATHER`
		`- gather_method = 'deps'`
		`- gather_profiler = True`
		`- # fomat: [(variant_uid_regex, {arch\|*: [repos]})]`
		`- # gather_lookaside_repos = []`
		`- # GATHER - JSON`
		`- # format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}`
		`- #gather_source_mapping = '/path/to/mapping.json'`
		`- # CREATEREPO`
		`- createrepo_c = True`
		`- createrepo_checksum = 'sha256'`
		`- # CHECKSUMS`
		`- media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'`
		`- #extra_packages = [`
		`- # '/mnt/packages/foo*',`
		`- #]`
		`- # fomat: [(variant_uid_regex, {arch\|*: [packages]})]`
		`- additional_packages = [`
		`- ('.*', {`
		`- '*': [`
		`- 'kernel.*',`
		`- 'dracut.*',`
		`- 'autocorr-.*',`
		`- 'eclipse-nls-.*',`
		`- 'hunspell-.*',`
		`- 'hyphen-.*',`
		`- 'calligra-l10n-.*',`
		`- 'kde-l10n-.*',`
		`- 'libreoffice-langpack-.*',`
		`- 'man-pages-.*',`
		`- 'mythes-.*',`
		`- ],`
		`- }),`
		`- ('^Everything$', {`
		`- '*': [`
		`- '*',`
		`- ],`
		`- }),`
		`- ('^Server$', {`
		`- '*': [`
		`- ],`
		`- }),`
		`- ('^Workstation$', {`
		`- '*': [`
		`- ],`
		`- }),`
		`- ('^Cloud$', {`
		`- '*': [`
		`- ],`
		`- }),`
		`- ]`
		`-`
		`- filter_packages = [`
		`- ('(Workstation\|Server)$', {`
		`- '*': [`
		`- 'kerneldebug',`
		`- 'kernel-kdump*',`
		`- 'kernel-tools*',`
		`- 'syslog-ng*',`
		`- 'astronomy-bookmarks',`
		`- 'generic*',`
		`- 'GConf2-dbus*',`
		`- 'bluez-gnome',`
		`- 'java-1.8.0-openjdk',`
		`- 'community-mysql*',`
		`- 'jruby*',`
		`- 'gimp-help-*',`
		`- ]`
		`- }),`
		`- ]`
		`-`
		`- createiso_skip = [`
		`- ('^Workstation$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`- ('^Server$', {`
		`- 'src': True`
		`- }),`
		`- ('^Cloud$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`- ('^Everything$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`- ]`
		`- # fomat: [(variant_uid_regex, {arch\|*: [scm_dicts]})]`
		`- #extra_files = [`
		`- # ('^(Server\|Workstation\|Cloud)$', {`
		`- # '*': [`
		`- # {`
		`- # 'scm': 'rpm',`
		`- # 'repo': 'fedora-release-%(variant_id_lower)s',`
		`- # 'branch': None,`
		`- # 'file': [`
		`- # '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',`
		`- # ],`
		`- # 'target': '',`
		`- # },`
		`- # ],`
		`- # }),`
		`- #]`
		`- # Image name respecting Fedora's image naming policy`
		`- image_name_format = 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s.%(respin)s.iso'`
		`- # # Use the same format for volume id`
		`- image_volid_formats = [`
		`- 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'`
		`- ]`
		`-`
		`- # These will be inherited by live_media, live_images, image_build, and kiwibuild`
		`- global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'`
		`- global_version = '42'`
		`- global_target = 'f42'`
		`-`
		`- # kiwi image global configuration`
		`- kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD'`
		`- kiwibuild_description_path = 'Fedora.kiwi'`
		`- # global_version is substituted by kobo as part of reading of this`
		`- # config file, the other specifiers are passed through to kiwi`
		`- kiwibuild_bundle_name_format = '%%N-%s-%%I.%%A' % global_version`
		`-`
		`- # kiwi images need another target that uses old mock chroot`
		`- kiwibuild_target = 'f42-kiwi'`
		`-`
		`- kiwibuild = {`
		`- '^Cloud$': [`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-Generic',`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['ppc64le', 's390x'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-AmazonEC2',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-Azure',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-GCE',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-UEFI-UKI',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Cloud_Base_UKI',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-Vagrant-libvirt',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-Vagrant-VirtualBox',`
		`- 'arches': ['x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- }`
		`- ],`
		`- }`
		`-`
		`- koji_profile = 'compose_koji'`

fedora-container.conf

file removed

-181

		`@@ -1,181 +0,0 @@`
		`- # Import general configuration from general.conf`
		`- from general import *`
		`- # Import multilib configuration from multilib.conf`
		`- from multilib import *`
		`-`
		`- # PRODUCT INFO`
		`- release_name = 'Fedora-Container'`
		`- release_short = 'Fedora-Container'`
		`- release_version = '42'`
		`- skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]`
		`- # GENERAL SETTINGS`
		`- comps_file = {`
		`- 'scm': 'git',`
		`- 'repo': 'https://pagure.io/fedora-comps.git',`
		`- 'branch': 'main',`
		`- 'file': 'comps-f42.xml',`
		`- 'command': 'make comps-f42.xml'`
		`- }`
		`- sigkeys = ['105ef944'] # None = unsigned`
		`- # limit tree variants`
		`- # if undefined, all variants from variants.xml will be included`
		`- tree_variants = ['Container']`
		`- # PKGSET`
		`- pkgset_koji_tag = 'f42-updates'`
		`- pkgset_koji_inherit = True`
		`- # GATHER`
		`- gather_method = 'deps'`
		`- gather_profiler = True`
		`- # fomat: [(variant_uid_regex, {arch\|*: [repos]})]`
		`- # gather_lookaside_repos = []`
		`- # GATHER - JSON`
		`- # format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}`
		`- #gather_source_mapping = '/path/to/mapping.json'`
		`- # CREATEREPO`
		`- createrepo_c = True`
		`- createrepo_checksum = 'sha256'`
		`- # CHECKSUMS`
		`- media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'`
		`- #extra_packages = [`
		`- # '/mnt/packages/foo*',`
		`- #]`
		`- # fomat: [(variant_uid_regex, {arch\|*: [packages]})]`
		`- additional_packages = [`
		`- ('.*', {`
		`- '*': [`
		`- 'kernel.*',`
		`- 'dracut.*',`
		`- 'autocorr-.*',`
		`- 'eclipse-nls-.*',`
		`- 'hunspell-.*',`
		`- 'hyphen-.*',`
		`- 'calligra-l10n-.*',`
		`- 'kde-l10n-.*',`
		`- 'libreoffice-langpack-.*',`
		`- 'man-pages-.*',`
		`- 'mythes-.*',`
		`- ],`
		`- }),`
		`- ('^Everything$', {`
		`- '*': [`
		`- '*',`
		`- ],`
		`- }),`
		`- ('^Server$', {`
		`- '*': [`
		`- ],`
		`- }),`
		`- ('^Workstation$', {`
		`- '*': [`
		`- ],`
		`- }),`
		`- ('^Cloud$', {`
		`- '*': [`
		`- ],`
		`- }),`
		`- ]`
		`-`
		`- filter_packages = [`
		`- ('(Workstation\|Server)$', {`
		`- '*': [`
		`- 'kerneldebug',`
		`- 'kernel-kdump*',`
		`- 'kernel-tools*',`
		`- 'syslog-ng*',`
		`- 'astronomy-bookmarks',`
		`- 'generic*',`
		`- 'GConf2-dbus*',`
		`- 'bluez-gnome',`
		`- 'java-1.8.0-openjdk',`
		`- 'community-mysql*',`
		`- 'jruby*',`
		`- 'gimp-help-*',`
		`- ]`
		`- }),`
		`- ]`
		`-`
		`- createiso_skip = [`
		`- ('^Workstation$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`- ('^Server$', {`
		`- 'src': True`
		`- }),`
		`- ('^Cloud$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`- ('^Everything$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`- ]`
		`- # fomat: [(variant_uid_regex, {arch\|*: [scm_dicts]})]`
		`- #extra_files = [`
		`- # ('^(Server\|Workstation\|Cloud)$', {`
		`- # '*': [`
		`- # {`
		`- # 'scm': 'rpm',`
		`- # 'repo': 'fedora-release-%(variant_id_lower)s',`
		`- # 'branch': None,`
		`- # 'file': [`
		`- # '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',`
		`- # ],`
		`- # 'target': '',`
		`- # },`
		`- # ],`
		`- # }),`
		`- #]`
		`- # Image name respecting Fedora's image naming policy`
		`- image_name_format = 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s.%(respin)s.iso'`
		`- # # Use the same format for volume id`
		`- image_volid_formats = [`
		`- 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'`
		`- ]`
		`-`
		`- # These will be inherited by live_media, live_images, image_build, and kiwibuild`
		`- global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'`
		`- global_version = '42'`
		`- global_target = 'f42'`
		`-`
		`- # kiwi image global configuration`
		`- kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD'`
		`- kiwibuild_description_path = 'Fedora.kiwi'`
		`- # global_version is substituted by kobo as part of reading of this`
		`- # config file, the other specifiers are passed through to kiwi`
		`- kiwibuild_bundle_name_format = '%%N-%s-%%I.%%A.%%T.tar' % global_version`
		`-`
		`-`
		`- kiwibuild = {`
		`- '^Container$': [`
		`- {`
		`- 'kiwi_profile': 'Container-Base-Generic',`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Container_Base',`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Container-Base-Generic-Minimal',`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Container_Minimal_Base',`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Container-Toolbox',`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repos': [`
		`- 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',`
		`- 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'`
		`- ],`
		`- 'subvariant': 'Container_Toolbox',`
		`- }`
		`- ],`
		`- }`
		`- koji_profile = 'compose_koji'`

fedora.conf

file removed

-1056

		`@@ -1,1056 +0,0 @@`
		`- # Import general configuration from general.conf`
		`- from general import *`
		`- # Import multilib configuration from multilib.conf`
		`- from multilib import *`
		`-`
		`- # PRODUCT INFO`
		`- release_name = 'Fedora'`
		`- release_short = 'Fedora'`
		`- release_version = 'Rawhide'`
		`-`
		`- # GENERAL SETTINGS`
		`- comps_file = {`
		`- 'scm': 'git',`
		`- 'repo': 'https://pagure.io/fedora-comps.git',`
		`- 'branch': 'main',`
		`- 'file': 'comps-rawhide.xml',`
		`- 'command': 'make comps-rawhide.xml'`
		`- }`
		`-`
		`- variants_file='variants-fedora.xml'`
		`- sigkeys = ['105ef944']`
		`-`
		`- # limit tree variants`
		`- # if undefined, all variants from variants.xml will be included`
		`- #tree_variants = ['Server']`
		`-`
		`- # RUNROOT settings`
		`- runroot_method = 'koji'`
		`-`
		`- # PKGSET`
		`- pkgset_source = 'koji' # koji, repos`
		`-`
		`- # PKGSET - REPOS`
		`- # pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}`
		`- # pkgset_repos = {}`
		`-`
		`- # PKGSET - KOJI`
		`- pkgset_koji_tag = 'f42'`
		`- pkgset_koji_inherit = False`
		`-`
		`- # GATHER`
		`- gather_method = {`
		`- '^.*': { # For all variants`
		`- 'comps': 'deps', # resolve dependencies for packages from comps file`
		`- }`
		`- }`
		`- gather_backend = 'dnf'`
		`- gather_profiler = False`
		`-`
		`- repoclosure_backend = 'dnf'`
		`-`
		`- # format: [(variant_uid_regex, {arch\|*: [repos]})]`
		`- # gather_lookaside_repos = []`
		`-`
		`- # GATHER - JSON`
		`- # format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}`
		`- #gather_source_mapping = '/path/to/mapping.json'`
		`-`
		`-`
		`- # CREATEREPO`
		`- createrepo_deltas = False`
		`- createrepo_database = True`
		`- createrepo_use_xz = True`
		`- createrepo_extra_args = ['--general-compress-type', 'gz', '--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/rawhide']`
		`- createrepo_num_workers = 10`
		`-`
		`- # CHECKSUMS`
		`- media_checksum_base_filename = '%(release_short)s-%(variant)s-%(dirname)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s'`
		`-`
		`- # CREATEISO`
		`- iso_hfs_ppc64le_compatible = False`
		`-`
		`- # use xorrisofs to make isos`
		`- createiso_use_xorrisofs = True`
		`-`
		`- # BUILDINSTALL`
		`- buildinstall_method = 'lorax'`
		`- buildinstall_skip = [`
		`- ('^Everything$', {`
		`- 'i386': True`
		`- }),`
		`- ]`
		`-`
		`- # Enables macboot on x86_64 for all variants and disables upgrade image building`
		`- # everywhere.`
		`- # Use 3GB image size for all arches.`
		`- lorax_options = [`
		`- ('^.*$', {`
		`- 'x86_64': {`
		`- 'nomacboot': False,`
		`- 'squashfs_only': True`
		`- },`
		`- '*': {`
		`- 'noupgrade': True,`
		`- 'rootfs_size': 3,`
		`- 'squashfs_only': True`
		`- }`
		`- })`
		`- ]`
		`-`
		`- #extra_packages = [`
		`- # '/mnt/packages/foo*',`
		`- #]`
		`-`
		`-`
		`- # format: [(variant_uid_regex, {arch\|*: [packages]})]`
		`- additional_packages = [`
		`- ('^(Server\|Everything)$', {`
		`- '*': [`
		`- 'kernel*',`
		`- 'dracut.*',`
		`- 'autocorr-*',`
		`- 'eclipse-nls',`
		`- 'eclipse-nls-*',`
		`- 'glibc-langpack-*',`
		`- 'hunspell-*',`
		`- 'hyphen-*',`
		`- 'kde-l10n-*',`
		`- 'langpacks-*',`
		`- 'man-pages-*',`
		`- 'mythes-*',`
		`- 'python3.*-debuginfo',`
		`- ],`
		`- }),`
		`-`
		`- ('^Everything$', {`
		`- '*': [`
		`- '*',`
		`- ],`
		`- }),`
		`-`
		`- ('^Server$', {`
		`- '*': [`
		`-`
		`- ],`
		`- }),`
		`-`
		`- ]`
		`-`
		`- filter_packages = [`
		`- ("^.*$", {`
		`- "*": ["glibc32", "libgcc32"],`
		`- "s390x": ["rust-std-static-wasm*"],`
		`- }),`
		`- ('(Server)$', {`
		`- '*': [`
		`- 'kerneldebug',`
		`- 'kernel-kdump*',`
		`- 'kernel-tools*',`
		`- 'syslog-ng*',`
		`- 'astronomy-bookmarks',`
		`- 'generic*',`
		`- 'GConf2-dbus*',`
		`- 'bluez-gnome',`
		`- 'java-11-openjdk',`
		`- 'community-mysql*',`
		`- 'jruby*',`
		`- 'gimp-help-*',`
		`- ]`
		`- }),`
		`- ]`
		`-`
		`- createiso_skip = [`
		`- ('^Server$', {`
		`- 'src': True`
		`- }),`
		`-`
		`- ('^Everything$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`- ]`
		`-`
		`- # format: [(variant_uid_regex, {arch\|*: [scm_dicts]})]`
		`- #extra_files = [`
		`- # ('^(Server)$', {`
		`- # '*': [`
		`- # {`
		`- # 'scm': 'rpm',`
		`- # 'repo': 'fedora-release-%(variant_id_lower)s',`
		`- # 'branch': None,`
		`- # 'file': [`
		`- # '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',`
		`- # ],`
		`- # 'target': '',`
		`- # },`
		`- # ],`
		`- # }),`
		`- #]`
		`-`
		`- # Image name respecting Fedora's image naming policy`
		`- image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso'`
		`- # # Use the same format for volume id`
		`- image_volid_formats = [`
		`- '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'`
		`- ]`
		`-`
		`-`
		`- # These will be inherited by live_media, live_images and image_build`
		`- global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'`
		`- global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'`
		`- global_version = 'Rawhide'`
		`- # live_images ignores this in favor of live_target`
		`- global_target = 'f42'`
		`- # kiwi images need another target that uses old mock chroot`
		`- kiwibuild_target = 'f42-kiwi'`
		`-`
		`- # kiwi image global configuration`
		`- kiwibuild_description_scm = 'git+https://pagure.io/fedora-kiwi-descriptions.git?#HEAD'`
		`- kiwibuild_description_path = 'Fedora.kiwi'`
		`- # global_version is substituted by kobo as part of reading of this`
		`- # config file, the other specifiers are passed through to kiwi`
		`- kiwibuild_bundle_name_format = '%%N-%s-%%I.%%A' % global_version`
		`-`
		`- # custom variable to make things easier`
		`- KIWI_ISO_VOLID_VERSION = 'rawh'`
		`-`
		`- image_build = {`
		`- '^Labs$': [`
		`- {`
		`- 'image-build': {`
		`- 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],`
		`- 'name': 'Fedora-Python-Classroom-Vagrant',`
		`- 'kickstart': 'fedora-python-classroom-vagrant.ks',`
		`- 'distro': 'Fedora-22',`
		`- 'disk_size': 42,`
		`- 'arches': ['x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Python_Classroom',`
		`- 'failable': ['*'],`
		`- },`
		`- 'factory-parameters': {`
		`- 'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],`
		`- 'name': 'Fedora-Scientific-Vagrant',`
		`- 'kickstart': 'fedora-scientific-vagrant.ks',`
		`- 'distro': 'Fedora-22',`
		`- 'disk_size': 42,`
		`- 'arches': ['x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Scientific',`
		`- 'failable': ['*'],`
		`- },`
		`- 'factory-parameters': {`
		`- 'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('raw-xz','raw.xz')],`
		`- 'name': 'Fedora-Python-Classroom',`
		`- 'kickstart': 'fedora-disk-python-classroom.ks',`
		`- 'distro': 'Fedora-30',`
		`- 'disk_size': 18,`
		`- 'arches': ['aarch64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Python_Classroom',`
		`- 'failable': ['*'],`
		`- }`
		`- },`
		`- ],`
		`- '^Spins': [`
		`- {`
		`- 'image-build': {`
		`- 'format': [('raw-xz','raw.xz')],`
		`- 'name': 'Fedora-KDE',`
		`- 'kickstart': 'fedora-disk-kde.ks',`
		`- 'distro': 'Fedora-30',`
		`- 'disk_size': 18,`
		`- 'arches': ['aarch64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'KDE',`
		`- 'failable': [''],`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('raw-xz','raw.xz')],`
		`- 'name': 'Fedora-SoaS',`
		`- 'kickstart': 'fedora-disk-soas.ks',`
		`- 'distro': 'Fedora-30',`
		`- 'disk_size': 10,`
		`- 'arches': ['aarch64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'SoaS',`
		`- 'failable': ['*'],`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('raw-xz','raw.xz')],`
		`- 'name': 'Fedora-Xfce',`
		`- 'kickstart': 'fedora-disk-xfce.ks',`
		`- 'distro': 'Fedora-30',`
		`- 'disk_size': 15,`
		`- 'arches': ['aarch64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Xfce',`
		`- 'failable': ['*'],`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('raw-xz','raw.xz')],`
		`- 'name': 'Fedora-LXQt',`
		`- 'kickstart': 'fedora-disk-lxqt.ks',`
		`- 'distro': 'Fedora-30',`
		`- 'disk_size': 13,`
		`- 'arches': ['aarch64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'LXQt',`
		`- 'failable': ['*'],`
		`- }`
		`- },`
		`- ],`
		`- '^Workstation$': [`
		`- {`
		`- 'image-build': {`
		`- 'format': [('raw-xz','raw.xz')],`
		`- 'name': 'Fedora-Workstation',`
		`- 'kickstart': 'fedora-disk-workstation.ks',`
		`- 'distro': 'Fedora-30',`
		`- 'disk_size': '16GB',`
		`- 'arches': ['aarch64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Workstation',`
		`- 'failable': [''],`
		`- }`
		`- },`
		`- ],`
		`- '^Server$': [`
		`- {`
		`- 'image-build': {`
		`- 'format': [('raw-xz','raw.xz')],`
		`- 'name': 'Fedora-Server',`
		`- 'kickstart': 'fedora-disk-server.ks',`
		`- 'distro': 'Fedora-30',`
		`- 'disk_size': 7,`
		`- 'arches': ['aarch64'],`
		`- 'repo': 'Server',`
		`- 'install_tree_from': 'Server',`
		`- 'subvariant': 'Server',`
		`- 'failable': ['*'],`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('qcow2','qcow2')],`
		`- 'name': 'Fedora-Server-KVM',`
		`- 'kickstart': 'fedora-server-vm-full.ks',`
		`- 'distro': 'Fedora-22',`
		`- 'disk_size': 7,`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Server_KVM',`
		`- 'failable': ['*'],`
		`- }`
		`- },`
		`- ],`
		`- }`
		`-`
		`- kiwibuild = {`
		`- '^Cloud$': [`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-Generic',`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['ppc64le', 's390x'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-AmazonEC2',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-Azure',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-GCE',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-UEFI-UKI',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Cloud_Base_UKI',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-Vagrant-libvirt',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Cloud-Base-Vagrant-VirtualBox',`
		`- 'arches': ['x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- }`
		`- ],`
		`- '^Container$': [`
		`- {`
		`- 'kiwi_profile': 'Container-Base-Generic',`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Container_Base',`
		`- 'target': global_target,`
		`- 'bundle_name_format': '%%N-%s-%%I.%%A.%%T.tar' % global_version,`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Container-Base-Generic-Minimal',`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Container_Minimal_Base',`
		`- 'target': global_target,`
		`- 'bundle_name_format': '%%N-%s-%%I.%%A.%%T.tar' % global_version,`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'Container-Toolbox',`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'Container_Toolbox',`
		`- 'target': global_target,`
		`- 'bundle_name_format': '%%N-%s-%%I.%%A.%%T.tar' % global_version,`
		`- 'failable': [''],`
		`- }`
		`- ],`
		`- '^Spins$': [`
		`- {`
		`- 'kiwi_profile': 'MiracleWM-Disk',`
		`- 'arches': ['aarch64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'MiracleWM',`
		`- 'type': 'oem',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'MiracleWM-Live',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'MiracleWM',`
		`- 'type': 'iso',`
		`- 'type_attr': [`
		`- 'volid=%s-MirWM-Live-%s' % (release_short, global_version),`
		`- 'application_id=%s-MiracleWM-Live-%s' % (release_short, global_version),`
		`- ],`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'KDE-Mobile-Disk',`
		`- 'arches': ['aarch64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'KDE_Mobile',`
		`- 'type': 'oem',`
		`- 'failable': ['*'],`
		`- },`
		`- {`
		`- 'kiwi_profile': 'KDE-Mobile-Live',`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repos': ['Everything'],`
		`- 'subvariant': 'KDE_Mobile',`
		`- 'type': 'iso',`
		`- 'type_attr': [`
		`- 'volid=%s-KDEM-Live-%s' % (release_short, KIWI_ISO_VOLID_VERSION),`
		`- 'application_id=%s-KDE_Mobile-Live-%s' % (release_short, global_version),`
		`- ],`
		`- 'failable': ['*'],`
		`- }`
		`- ],`
		`- }`
		`-`
		`- live_media = {`
		`- '^Workstation$': [`
		`- {`
		`- 'name': 'Fedora-Workstation-Live',`
		`- 'kickstart': 'fedora-live-workstation.ks',`
		`- 'arches': ['x86_64', 'ppc64le', 'aarch64'],`
		`- 'failable': ['ppc64le', 'aarch64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Workstation'`
		`-`
		`- }`
		`- ],`
		`- '^Spins': [`
		`- {`
		`- 'name': 'Fedora-KDE-Live',`
		`- 'kickstart': 'fedora-live-kde.ks',`
		`- 'arches': ['x86_64', 'aarch64', 'ppc64le'],`
		`- 'failable': ['aarch64', 'ppc64le'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'KDE'`
		`-`
		`- },`
		`- {`
		`- 'name': 'Fedora-Xfce-Live',`
		`- 'kickstart': 'fedora-live-xfce.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Xfce'`
		`- },`
		`- {`
		`- 'name': 'Fedora-SoaS-Live',`
		`- 'kickstart': 'fedora-live-soas.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'SoaS'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Cinnamon-Live',`
		`- 'kickstart': 'fedora-live-cinnamon.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Cinnamon'`
		`- },`
		`- {`
		`- 'name': 'Fedora-LXDE-Live',`
		`- 'kickstart': 'fedora-live-lxde.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'LXDE'`
		`- },`
		`- {`
		`- 'name': 'Fedora-MATE_Compiz-Live',`
		`- 'kickstart': 'fedora-live-mate_compiz.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Mate'`
		`- },`
		`- {`
		`- 'name': 'Fedora-LXQt-Live',`
		`- 'kickstart': 'fedora-live-lxqt.ks',`
		`- 'arches': ['x86_64', 'aarch64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'LXQt'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Budgie-Live',`
		`- 'kickstart': 'fedora-live-budgie.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Budgie'`
		`- },`
		`- {`
		`- 'name': 'Fedora-i3-Live',`
		`- 'kickstart': 'fedora-live-i3.ks',`
		`- 'arches': ['x86_64', 'aarch64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'i3'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Sway-Live',`
		`- 'kickstart': 'fedora-live-sway.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Sway'`
		`- }`
		`- ],`
		`- '^Labs$': [`
		`- {`
		`- 'name': 'Fedora-Astronomy_KDE-Live',`
		`- 'kickstart': 'fedora-live-astronomy_kde.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Astronomy_KDE'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Comp_Neuro-Live',`
		`- 'kickstart': 'fedora-live-comp_neuro.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Comp_Neuro'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Design_suite-Live',`
		`- 'kickstart': 'fedora-live-design_suite.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Design_suite'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Scientific_KDE-Live',`
		`- 'kickstart': 'fedora-live-scientific_kde.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Scientific_KDE'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Games-Live',`
		`- 'kickstart': 'fedora-live-games.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Games'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Security-Live',`
		`- 'kickstart': 'fedora-live-security.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Security'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Jam_KDE-Live',`
		`- 'kickstart': 'fedora-live-jam_kde.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Jam_KDE'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Robotics-Live',`
		`- 'kickstart': 'fedora-live-robotics.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Robotics'`
		`- },`
		`- {`
		`- 'name': 'Fedora-Python-Classroom-Live',`
		`- 'kickstart': 'fedora-live-python-classroom.ks',`
		`- 'arches': ['x86_64'],`
		`- 'failable': ['*'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Python_Classroom'`
		`- }`
		`- ],`
		`- }`
		`-`
		`- failable_deliverables = [`
		`- ('^.*$', {`
		`- # Buildinstall is non blocking`
		`- 'src': ['buildinstall'],`
		`- # Nothing on i386, ppc64le blocks the compose`
		`- 'i386': ['buildinstall', 'iso'],`
		`- 'ppc64le': ['buildinstall', 'iso'],`
		`- 's390x': ['buildinstall', 'iso'],`
		`- })`
		`- ]`
		`-`
		`- ostree = {`
		`- "^Silverblue$": {`
		`- "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`- "force_new_commit": True,`
		`- "unified_core": True,`
		`- "treefile": "silverblue-ostree.yaml",`
		`- "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`- "config_branch": "main",`
		`- "repo": "Everything",`
		`- "tag_ref": False,`
		`- "ostree_repo": "/mnt/koji/compose/ostree/repo/",`
		`- "ostree_ref": "fedora/rawhide/${basearch}/silverblue",`
		`- "runroot_packages": ["selinux-policy-targeted"],`
		`- "arches": ["x86_64", "ppc64le", "aarch64"],`
		`- "failable": ['*'],`
		`- },`
		`- "^Kinoite$": {`
		`- "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`- "force_new_commit": True,`
		`- "unified_core": True,`
		`- "treefile": "kinoite-ostree.yaml",`
		`- "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`- "config_branch": "main",`
		`- "repo": "Everything",`
		`- "tag_ref": False,`
		`- "ostree_repo": "/mnt/koji/compose/ostree/repo/",`
		`- "ostree_ref": "fedora/rawhide/${basearch}/kinoite",`
		`- "runroot_packages": ["selinux-policy-targeted"],`
		`- "arches": ["x86_64", "ppc64le", "aarch64"],`
		`- "failable": ['*'],`
		`- },`
		`- "^Sericea$": {`
		`- "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`- "force_new_commit": True,`
		`- "unified_core": True,`
		`- "treefile": "sway-atomic-ostree.yaml",`
		`- "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`- "config_branch": "main",`
		`- "repo": "Everything",`
		`- "tag_ref": False,`
		`- "ostree_repo": "/mnt/koji/compose/ostree/repo/",`
		`- "ostree_ref": "fedora/rawhide/${basearch}/sericea",`
		`- "runroot_packages": ["selinux-policy-targeted"],`
		`- "arches": ["x86_64", "aarch64"],`
		`- "failable": ['*'],`
		`- },`
		`- "^Onyx$": {`
		`- "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`- "force_new_commit": True,`
		`- "unified_core": True,`
		`- "treefile": "budgie-atomic-ostree.yaml",`
		`- "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`- "config_branch": "main",`
		`- "repo": "Everything",`
		`- "tag_ref": False,`
		`- "ostree_repo": "/mnt/koji/compose/ostree/repo/",`
		`- "ostree_ref": "fedora/rawhide/${basearch}/onyx",`
		`- "runroot_packages": ["selinux-policy-targeted"],`
		`- "arches": ["x86_64"],`
		`- "failable": ['*'],`
		`- }`
		`- }`
		`-`
		`- ostree_container = {`
		`- "^Silverblue$": {`
		`- "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`- "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`- "config_branch": "main",`
		`- "treefile": "silverblue.yaml",`
		`- "arches": ["x86_64", "ppc64le", "aarch64"],`
		`- "failable": ['*'],`
		`- },`
		`- "^Kinoite$": {`
		`- "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`- "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`- "config_branch": "main",`
		`- "treefile": "kinoite.yaml",`
		`- "arches": ["x86_64", "ppc64le", "aarch64"],`
		`- "failable": ['*'],`
		`- },`
		`- "^Sericea$": {`
		`- "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`- "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`- "config_branch": "main",`
		`- "treefile": "sway-atomic.yaml",`
		`- "arches": ["x86_64", "aarch64"],`
		`- "failable": ['*'],`
		`- },`
		`- "^Onyx$": {`
		`- "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`- "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`- "config_branch": "main",`
		`- "treefile": "budgie-atomic.yaml",`
		`- "arches": ["x86_64"],`
		`- "failable": ['*'],`
		`- }`
		`- }`
		`-`
		`- ostree_installer = [`
		`- ("^Silverblue$", {`
		`- "x86_64": {`
		`- "repo": "Everything",`
		`- "release": None,`
		`- "rootfs_size": "9",`
		`- "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-flatpaks.tmpl"],`
		`- "add_template_var": [`
		`- "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`- "ostree_update_repo=https://ostree.fedoraproject.org",`
		`- "ostree_osname=fedora",`
		`- "ostree_oskey=fedora-42-primary",`
		`- "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`- "ostree_install_ref=fedora/rawhide/x86_64/silverblue",`
		`- "ostree_update_ref=fedora/rawhide/x86_64/silverblue",`
		`- "flatpak_remote_name=fedora",`
		`- # using registry-no-cdn avoids redirects to the CDN;`
		`- # needed because of network restrictions on koji runroot`
		`- "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`- # keeping them on the stable release until the flatpak sig confirms the next update`
		- "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f40 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.Snapshot/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Loupe/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Weather/x86_64/stable",
		`- ],`
		`- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`- 'template_branch': 'main',`
		`- # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`- 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`- 'failable': ['*'],`
		`- },`
		`- "ppc64le": {`
		`- "repo": "Everything",`
		`- "release": None,`
		`- "rootfs_size": "9",`
		`- "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-flatpaks.tmpl"],`
		`- "add_template_var": [`
		`- "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`- "ostree_update_repo=https://ostree.fedoraproject.org",`
		`- "ostree_osname=fedora",`
		`- "ostree_oskey=fedora-42-primary",`
		`- "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`- "ostree_install_ref=fedora/rawhide/ppc64le/silverblue",`
		`- "ostree_update_ref=fedora/rawhide/ppc64le/silverblue",`
		`- "flatpak_remote_name=fedora",`
		`- # using registry-no-cdn avoids redirects to the CDN;`
		`- # needed because of network restrictions on koji runroot`
		`- "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`- # keeping them on the stable release until the flatpak sig confirms the next update`
		- "flatpak_remote_refs=runtime/org.fedoraproject.Platform/ppc64le/f40 app/org.gnome.baobab/ppc64le/stable app/org.gnome.Calculator/ppc64le/stable app/org.gnome.Calendar/ppc64le/stable app/org.gnome.Characters/ppc64le/stable app/org.gnome.Snapshot/ppc64le/stable app/org.gnome.clocks/ppc64le/stable app/org.gnome.Connections/ppc64le/stable app/org.gnome.Contacts/ppc64le/stable app/org.gnome.Evince/ppc64le/stable app/org.gnome.Extensions/ppc64le/stable app/org.gnome.font-viewer/ppc64le/stable app/org.gnome.TextEditor/ppc64le/stable app/org.gnome.Loupe/ppc64le/stable app/org.gnome.Logs/ppc64le/stable app/org.gnome.Maps/ppc64le/stable app/org.fedoraproject.MediaWriter/ppc64le/stable app/org.gnome.NautilusPreviewer/ppc64le/stable app/org.gnome.Weather/ppc64le/stable",
		`- ],`
		`- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`- 'template_branch': 'main',`
		`- # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`- 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`- 'failable': ['*'],`
		`- },`
		`- "aarch64": {`
		`- "repo": "Everything",`
		`- "release": None,`
		`- "rootfs_size": "9",`
		`- "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-flatpaks.tmpl"],`
		`- "add_template_var": [`
		`- "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`- "ostree_update_repo=https://ostree.fedoraproject.org",`
		`- "ostree_osname=fedora",`
		`- "ostree_oskey=fedora-42-primary",`
		`- "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`- "ostree_install_ref=fedora/rawhide/aarch64/silverblue",`
		`- "ostree_update_ref=fedora/rawhide/aarch64/silverblue",`
		`- "flatpak_remote_name=fedora",`
		`- # using registry-no-cdn avoids redirects to the CDN;`
		`- # needed because of network restrictions on koji runroot`
		`- "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`- # keeping them on the stable release until the flatpak sig confirms the next update`
		- "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f40 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.Snapshot/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Loupe/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Weather/aarch64/stable",
		`- ],`
		`- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`- 'template_branch': 'main',`
		`- # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`- 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`- 'failable': ['*'],`
		`- }`
		`- }),`
		`- ("^Kinoite$", {`
		`- "x86_64": {`
		`- "repo": "Everything",`
		`- "release": None,`
		`- "rootfs_size": "11",`
		`- "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-flatpaks.tmpl"],`
		`- "add_template_var": [`
		`- "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`- "ostree_update_repo=https://ostree.fedoraproject.org",`
		`- "ostree_osname=fedora",`
		`- "ostree_oskey=fedora-42-primary",`
		`- "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`- "ostree_install_ref=fedora/rawhide/x86_64/kinoite",`
		`- "ostree_update_ref=fedora/rawhide/x86_64/kinoite",`
		`- "flatpak_remote_name=fedora",`
		`- # using registry-no-cdn avoids redirects to the CDN;`
		`- # needed because of network restrictions on koji runroot`
		`- "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`- # keeping them on the stable release until the flatpak sig confirms the next update`
		`- "flatpak_remote_refs=runtime/org.fedoraproject.KDE6Platform/x86_64/f40 app/org.kde.elisa/x86_64/stable app/org.kde.gwenview/x86_64/stable app/org.kde.kcalc/x86_64/stable app/org.kde.kmahjongg/x86_64/stable app/org.kde.kmines/x86_64/stable app/org.kde.kolourpaint/x86_64/stable app/org.kde.krdc/x86_64/stable app/org.kde.okular/x86_64/stable app/org.kde.skanpage/x86_64/stable",`
		`- ],`
		`- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`- 'template_branch': 'main',`
		`- # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`- 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`- 'failable': ['*'],`
		`- },`
		`- "ppc64le": {`
		`- "repo": "Everything",`
		`- "release": None,`
		`- "rootfs_size": "11",`
		`- "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-flatpaks.tmpl"],`
		`- "add_template_var": [`
		`- "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`- "ostree_update_repo=https://ostree.fedoraproject.org",`
		`- "ostree_osname=fedora",`
		`- "ostree_oskey=fedora-42-primary",`
		`- "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`- "ostree_install_ref=fedora/rawhide/ppc64le/kinoite",`
		`- "ostree_update_ref=fedora/rawhide/ppc64le/kinoite",`
		`- "flatpak_remote_name=fedora",`
		`- # using registry-no-cdn avoids redirects to the CDN;`
		`- # needed because of network restrictions on koji runroot`
		`- "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`- # keeping them on the stable release until the flatpak sig confirms the next update`
		`- "flatpak_remote_refs=runtime/org.fedoraproject.KDE6Platform/ppc64le/f40 app/org.kde.elisa/ppc64le/stable app/org.kde.gwenview/ppc64le/stable app/org.kde.kcalc/ppc64le/stable app/org.kde.kmahjongg/ppc64le/stable app/org.kde.kmines/ppc64le/stable app/org.kde.kolourpaint/ppc64le/stable app/org.kde.krdc/ppc64le/stable app/org.kde.okular/ppc64le/stable",`
		`- ],`
		`- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`- 'template_branch': 'main',`
		`- # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`- 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`- 'failable': ['*'],`
		`- },`
		`- "aarch64": {`
		`- "repo": "Everything",`
		`- "release": None,`
		`- "rootfs_size": "11",`
		`- "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-flatpaks.tmpl"],`
		`- "add_template_var": [`
		`- "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`- "ostree_update_repo=https://ostree.fedoraproject.org",`
		`- "ostree_osname=fedora",`
		`- "ostree_oskey=fedora-42-primary",`
		`- "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`- "ostree_install_ref=fedora/rawhide/aarch64/kinoite",`
		`- "ostree_update_ref=fedora/rawhide/aarch64/kinoite",`
		`- "flatpak_remote_name=fedora",`
		`- # using registry-no-cdn avoids redirects to the CDN;`
		`- # needed because of network restrictions on koji runroot`
		`- "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`- # keeping them on the stable release until the flatpak sig confirms the next update`
		`- "flatpak_remote_refs=runtime/org.fedoraproject.KDE6Platform/aarch64/f40 app/org.kde.elisa/aarch64/stable app/org.kde.gwenview/aarch64/stable app/org.kde.kcalc/aarch64/stable app/org.kde.kmahjongg/aarch64/stable app/org.kde.kmines/aarch64/stable app/org.kde.kolourpaint/aarch64/stable app/org.kde.krdc/aarch64/stable app/org.kde.okular/aarch64/stable app/org.kde.skanpage/aarch64/stable",`
		`- ],`
		`- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`- 'template_branch': 'main',`
		`- # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`- 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`- 'failable': ['*'],`
		`- }`
		`- }),`
		`- ("^Sericea$", {`
		`- "x86_64": {`
		`- "repo": "Everything",`
		`- "release": None,`
		`- "rootfs_size": "9",`
		`- "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-repo.tmpl"],`
		`- "add_template_var": [`
		`- "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`- "ostree_update_repo=https://ostree.fedoraproject.org",`
		`- "ostree_osname=fedora",`
		`- "ostree_oskey=fedora-42-primary",`
		`- "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`- "ostree_install_ref=fedora/rawhide/x86_64/sericea",`
		`- "ostree_update_ref=fedora/rawhide/x86_64/sericea",`
		`- "flatpak_remote_name=fedora",`
		`- # using registry-no-cdn avoids redirects to the CDN;`
		`- # needed because of network restrictions on koji runroot`
		`- "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`- "flatpak_remote_refs=",`
		`- ],`
		`- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`- 'template_branch': 'main',`
		`- # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`- 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`- 'failable': ['*'],`
		`- }`
		`- }),`
		`- ("^Onyx$", {`
		`- "x86_64": {`
		`- "repo": "Everything",`
		`- "release": None,`
		`- "rootfs_size": "9",`
		`- "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`- "ostree-based-installer/lorax-embed-repo.tmpl"],`
		`- "add_template_var": [`
		`- "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`- "ostree_update_repo=https://ostree.fedoraproject.org",`
		`- "ostree_osname=fedora",`
		`- "ostree_oskey=fedora-42-primary",`
		`- "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`- "ostree_install_ref=fedora/rawhide/x86_64/onyx",`
		`- "ostree_update_ref=fedora/rawhide/x86_64/onyx",`
		`- "flatpak_remote_name=fedora",`
		`- # using registry-no-cdn avoids redirects to the CDN;`
		`- # needed because of network restrictions on koji runroot`
		`- "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`- "flatpak_remote_refs=",`
		`- ],`
		`- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`- 'template_branch': 'main',`
		`- # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`- 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`- 'failable': ['*'],`
		`- }`
		`- })`
		`- ]`
		`-`
		`- osbuild = {`
		`- '^Workstation$': [`
		`- {`
		`- 'name': 'Fedora-Workstation-Live-osb',`
		`- 'distro': 'fedora-42',`
		`- 'image_types': ['live-installer'],`
		`- 'arches': ['x86_64', 'aarch64'],`
		`- 'repo': ['Everything'],`
		`- 'failable': ['*'],`
		`- 'manifest_type': 'live-osbuild',`
		`- }`
		`- ]`
		`- '^Spins$': [`
		`- {`
		`- 'name': 'Fedora-Minimal',`
		`- 'distro': 'fedora-42',`
		`- 'image_types': ['minimal-raw'],`
		`- 'arches': ['aarch64'],`
		`- 'repo': ['Everything'],`
		`- 'manifest_type': 'raw-xz',`
		`- 'subvariant': 'Minimal',`
		`- }`
		`- ]`
		`- }`
		`-`
		`- koji_profile = 'compose_koji'`

general.conf

file removed

-86

		`@@ -1,86 +0,0 @@`
		`- # GENERAL SETTINGS`
		`- variants_file='variants-fedora.xml'`
		`-`
		`- # limit tree architectures`
		`- # if undefined, all architectures from variants.xml will be included`
		`- tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']`
		`-`
		`- hashed_directories = True`
		`-`
		`- # RUNROOT settings`
		`- runroot_channel = 'compose'`
		`- runroot_tag = 'f42-build'`
		`-`
		`- # PKGSET`
		`- pkgset_source = 'koji' # koji, repos`
		`- filter_system_release_packages = False`
		`-`
		`- # GATHER`
		`- check_deps = False`
		`- greedy_method = 'build'`
		`-`
		`- # CHECKSUMS`
		`- media_checksums = ['sha256']`
		`- media_checksum_one_file = True`
		`-`
		`- #jigdo`
		`- create_jigdo = False`
		`-`
		`- # MULTILIB`
		`- multilib = [`
		`- ('^Everything$', {`
		`- 'x86_64': ['devel', 'runtime'],`
		`- })`
		`- ]`
		`-`
		`- # ISO IMAGE`
		`- image_volid_layered_product_formats = []`
		`-`
		`- # Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.`
		`- # There is a hard 32-character limit on ISO volume IDs, so we use`
		`- # these to try and produce short enough but legible IDs. Note this is`
		`- # duplicated in Koji for live images, as livemedia-creator does not`
		`- # allow Pungi to tell it what volume ID to use. Note:`
		`- # https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy`
		`- # '-Workstation-' is a temporary workaround. See`
		`- # https://pagure.io/pungi-fedora/pull-request/525`
		`- # Replace 'Cloud' with 'C' in volume id etc.`
		`- volume_id_substitutions = {`
		`- 'Beta': 'B',`
		`- 'Rawhide': 'rawh',`
		`- 'Astronomy_KDE': 'AstK',`
		`- 'Silverblue': 'SB',`
		`- 'Kinoite': 'Knt',`
		`- 'Cinnamon': 'Cinn',`
		`- 'Cloud': 'C',`
		`- 'Comp_Neuro': 'CNr',`
		`- 'Design_suite': 'Dsgn',`
		`- 'Electronic_Lab': 'Elec',`
		`- 'Everything': 'E',`
		`- 'Games': 'Game',`
		`- 'Images': 'img',`
		`- 'Jam_KDE': 'Jam',`
		`- 'KDE_Desktop': 'KDE',`
		`- 'KDE_Mobile': 'KDEM',`
		`- 'MATE_Compiz': 'MATE',`
		`- 'MiracleWM': 'MirWM',`
		`- 'Onyx': 'Onyx',`
		`- # Note https://pagure.io/pungi-fedora/issue/533`
		`- 'Python-Classroom': 'Clss',`
		`- 'Python_Classroom': 'Clss',`
		`- 'Robotics': 'Robo',`
		`- 'Scientific_KDE': 'SciK',`
		`- 'Security': 'Sec',`
		`- 'Sericea': 'Src',`
		`- 'Server': 'S',`
		`- '-Workstation-': '-WS-',`
		`- }`
		`-`
		`- disc_types = {`
		`- 'boot': 'netinst',`
		`- 'live': 'Live',`
		`- }`
		`-`
		`- translate_paths = [`
		`- ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),`
		`- ]`

multilib.conf

file removed

-91

		`@@ -1,91 +0,0 @@`
		`- # MULTILIB`
		`-`
		`- # Note: If you change something here (affects Rawhide/Branched composes), also`
		`- # submit the same change to the Bodhi config (affects updates for stable releases),`
		`- # we want to keep them in sync:`
		`- # https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2`
		`- #`
		`- # format: {arch\|*: [packages]}`
		`- # Sorted alphabetically`
		`- multilib_blacklist = {`
		`- '*': [`
		`- 'bash-devel',`
		`- 'dmraid-devel',`
		`- 'ghc-*',`
		`- 'httpd-core',`
		`- 'httpd-devel',`
		`- 'java-*',`
		`- 'kdeutils-devel',`
		`- 'kernel',`
		`- 'kerneldebug',`
		`- 'kernel-PAE*',`
		`- 'krb5-server',`
		`- 'krb5-server-ldap',`
		`- 'mkinitrd-devel',`
		`- 'mod_*',`
		`- 'mp'`
		`- 'php*',`
		`- 'php-devel',`
		`- 'tomcat-native',`
		`- ],`
		`- }`
		`-`
		`- # Note: If you change something here (affects Rawhide/Branched composes), also`
		`- # submit the same change to the Bodhi config (affects updates for stable releases),`
		`- # we want to keep them in sync:`
		`- # https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2`
		`- #`
		`- # format: {arch\|*: [packages]}`
		`- # Sorted alphabetically`
		`- multilib_whitelist = {`
		`- '*': [`
		`- '*-static',`
		`- 'apitrace-libs',`
		`- 'compiler-rt',`
		`- 'dssi-vst-wine',`
		`- 'fakechroot-libs',`
		`- 'fakeroot-libs',`
		`- 'glib-networking',`
		`- 'glx-utils',`
		`- 'gtk-2.0',`
		`- 'gtk-2.0/*',`
		`- 'gtk-3.0',`
		`- 'gtk-3.0/*',`
		`- 'ibus-gtk2',`
		`- 'ibus-gtk3',`
		`- 'ibus-libs',`
		`- 'iptables',`
		`- 'libflashsupport',`
		`- 'libgnat',`
		`- 'libomp',`
		`- 'lmms-vst',`
		`- 'mangohud',`
		`- 'mariadb-connector-odbc',`
		`- 'mesa-dri-drivers',`
		`- 'mesa-va-drivers',`
		`- 'mesa-vdpau-drivers',`
		`- 'mesa-vulkan-drivers',`
		`- 'mysql-connector-odbc',`
		`- 'nosync',`
		`- 'nspluginwrapper',`
		`- 'nvidia-query-resource-opengl-lib',`
		`- 'obs-studio-libs',`
		`- 'obs-studio-plugin-vkcapture',`
		`- 'p11-kit-trust',`
		`- 'pam',`
		`- 'perl-libs',`
		`- 'pipewire',`
		`- 'postgresql-odbc',`
		`- 'redhat-lsb',`
		`- 'syslinux-extlinux-nonlinux',`
		`- 'syslinux-nonlinux',`
		`- 'syslinux-tftpboot',`
		`- 'systemd-pam',`
		`- 'valgrind',`
		`- 'vkBasalt',`
		`- 'vulkan-validation-layers',`
		`- 'wine',`
		`- 'wine-*',`
		`- 'yaboot',`
		`- ],`
		`- }`

nightly.sh

file modified

+49 -160

		`@@ -1,31 +1,27 @@`
		`#!/bin/sh`

		`-`
		`export LC_ALL=C`

		`- CONFIG="fedora.conf"`
		`- TARGET_DIR="/mnt/koji/compose/rawhide"`
		`+ CONFIG="epel.conf"`
		`+ TARGET_DIR="/mnt/koji/compose/epel10"`
		`MD_ARCHIVE_DIR="/mnt/koji/compose/metadata-archive"`
		`SERIES_DIR="$MD_ARCHIVE_DIR/series"`
		`#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"`
		`NIGHTLY="--nightly"`
		`- SKIP_PHASES=""`
		`- DEST=$(pwd)`
		`+ SKIP_PHASES="--skip-phase=buildinstall --skip-phase=extra_files --skip-phase=createiso"`
		`DATE=$(date "+%Y%m%d")`
		`- SHORT="Fedora"`
		`- RELEASE="rawhide"`
		`- RELEASE_TITLE="Rawhide"`
		`- COMPSFILE="comps-rawhide.xml"`
		- TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
		`+ SHORT="Fedora-EPEL"`
		`+ RELEASE="10"`
		`+ RELEASE_TITLE="10"`
		`TOMAIL="devel@lists.fedoraproject.org test-reports@lists.fedoraproject.org"`
		`- FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"`
		`+ FROM="Fedora EPEL Report <rawhide@fedoraproject.org>"`
		`RSYNCPREFIX="sudo -u ftpsync"`
		`- RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"`
		`- RSYNCALTTARGET="/pub/alt/development/$RELEASE"`
		`- RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE"`
		`- OSTREESRCREPO="/mnt/koji/compose/ostree/repo/"`
		`- OSTREEDESTREPO="/mnt/koji/ostree/repo/"`
		`- OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)`
		`+ RSYNCTARGET="/pub/epel/$RELEASE"`
		`+`
		`+ if [ -f $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID ]; then`
		`+ OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)`
		`+ fi`
		`+`
		`# uncomment and edit for resuming a failed compose`
		`#COMPOSE_ID="Fedora-23-20150530.n.0"`

		`@@ -36,7 +32,7 @@`
		`git pull --rebase`
		`popd`
		`else`
		`- git clone https://pagure.io/releng.git`
		`+ git clone --depth 1 https://pagure.io/releng.git`
		`fi`

		`# Set up our fedora messaging function, using the releng repo definition`
		`@@ -48,19 +44,11 @@`
		`fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")`
		`send_fedora_message "${fedora_message_json_start}" ${RELEASE} start`

		`- #pushd $TMPDIR`
		`- #git clone https://pagure.io/fedora-comps.git && {`
		`- # pushd fedora-comps`
		`- # make "${COMPSFILE}"`
		`- # cp "${COMPSFILE}" $DEST/`
		`- # popd`
		`- #}`
		`- #popd`
		`-`
		`- ./releng/scripts/block_retired.py --profile compose_koji`
		`- ./releng/scripts/block_retired.py --profile compose_koji --namespace=container`
		`-`
		`- 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 $SKIP_PHASES"`
		`+ CMD="pungi-koji \`
		`+ --notification-script=/usr/bin/pungi-fedmsg-notification \`
		`+ --config=$CONFIG \`
		`+ --old-composes=$TARGET_DIR \`
		`+ $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"`

		`if [ -z "$COMPOSE_ID" ]; then`
		`CMD="$CMD --target-dir=$TARGET_DIR"`
		`@@ -74,156 +62,57 @@`
		`fi`

		`NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)`
		`- SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID\|sed -e 's\|Fedora-.*-\|\|g')`
		`+ SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID\|sed -e "s\|$SHORT-.*-\|\|g")`

		`# Set this to use later for a few items include depcheck`
		`DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID`
		`# Public URLs the synced compose will wind up at, we put them in fedora-messaging`
		`LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"`
		`- ALT_LOCATION="https://dl.fedoraproject.org$RSYNCALTTARGET"`
		`- SECONDARY_LOCATION="https://dl.fedoraproject.org$RSYNCSECTARGET"`
		`# Update fedora_message template`
		`- fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION", "$ALT_LOCATION", "$SECONDARY_LOCATION")`
		`- fedora_message_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION" "$ALT_LOCATION" "$SECONDARY_LOCATION")`
		`-`
		`- # Fix permissions on the grub efi files and fonts (they're 0600)`
		`- chmod -R go+r $DESTDIR/compose///os/EFI/`
		`-`
		`- if ! compose-changelog -p "$DESTDIR/logs/" "$TARGET_DIR/$OLDCOMPOSE_ID/" "$DESTDIR/" 2>"$DESTDIR/logs/changelog.stderr"; then`
		`- # Generating changelog failed. We should not send an empty announcement to`
		`- # general public.`
		`- TOMAIL=""`
		`- VERSION="$(rpm -q compose-utils)"`
		`- # Instead report it to rel-eng@ list.`
		`- mutt -e "set from=\"$FROM\"" \`
		`- -e 'set envelope_from=yes' \`
		`- -s "Generating changelog for $NEWCOMPOSE_ID failed (with $VERSION)" \`
		`- rel-eng@lists.fedoraproject.org \`
		`- < "$DESTDIR/changelog.stderr"`
		`+ fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")`
		`+ fedora_message_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")`
		`+`
		`+ if [ -n "$OLDCOMPOSE_ID" ]; then`
		`+ if ! compose-changelog -p "$DESTDIR/logs/" "$TARGET_DIR/$OLDCOMPOSE_ID/" "$DESTDIR/" 2>"$DESTDIR/logs/changelog.stderr"; then`
		`+ # Generating changelog failed. We should not send an empty announcement to`
		`+ # general public.`
		`+ TOMAIL=""`
		`+ VERSION="$(rpm -q compose-utils)"`
		`+ # Instead report it to rel-eng@ list.`
		`+ mutt -e "set from=\"$FROM\"" \`
		`+ -e 'set envelope_from=yes' \`
		`+ -s "Generating changelog for $NEWCOMPOSE_ID failed (with $VERSION)" \`
		`+ rel-eng@lists.fedoraproject.org \`
		`+ < "$DESTDIR/changelog.stderr"`
		`+ fi`
		`fi`

		`- # Figure out a version for broken deps e-mail that goes to package maintainers.`
		`- # In Rawhide it's just rawhide, for branched versions we prepend F- to the number.`
		`- if [ "$RELEASE" = "rawhide" ]; then`
		`- TREENAME="$RELEASE"`
		`- else`
		`- TREENAME="F-$RELEASE"`
		`- fi`
		`- # disable sending email for now until we are sure we wont generating mass emails`
		`- ./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"`
		`-`
		`- [ -z "$ARCH" ] && {`
		`- ./releng/scripts/critpath.py --composeurl file://$DESTDIR/compose -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log`
		`- }`
		`-`
		`# Tell interested persons that the rsync is starting (zomg!)`
		`send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start`

		`- # Sync the content to /pub/fedora`
		`+ # Sync the content to target`
		`if [ ! -d "$RSYNCTARGET" ]; then`
		`- mkdir "$RSYNCTARGET"`
		`+ $RSYNCPREFIX mkdir "$RSYNCTARGET"`
		`fi`
		`- # aarch64/x86_64 for Everything Cloud Container Server Workstation is primary`
		`- $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \`
		`+ $RSYNCPREFIX compose-partial-copy \`
		`+ --arch=aarch64 --arch=ppc64le --arch=s390x --arch=x86_64 --arch src \`
		`"$DESTDIR" "$RSYNCTARGET/" \`
		`--variant Everything \`
		`- --variant Cloud \`
		`- --variant Container \`
		`- --variant Server \`
		`- --variant Spins \`
		`- --variant Silverblue \`
		`- --variant Kinoite \`
		`- --variant Sericea \`
		`- --variant Onyx \`
		`- --variant Workstation \`
		`- --link-dest="$RSYNCTARGET/Everything" --exclude=repodata`
		`- $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \`
		`+ --link-dest="$RSYNCTARGET/Everything" \`
		`+ --exclude=repodata`
		`+ $RSYNCPREFIX compose-partial-copy \`
		`+ --arch=aarch64 --arch=ppc64le --arch=s390x --arch=x86_64 --arch src \`
		`"$DESTDIR" "$RSYNCTARGET/" \`
		`--variant Everything \`
		`- --variant Cloud \`
		`- --variant Container \`
		`- --variant Server \`
		`- --variant Spins \`
		`- --variant Silverblue \`
		`- --variant Kinoite \`
		`- --variant Sericea \`
		`- --variant Onyx \`
		`- --variant Workstation \`
		`- --link-dest="$RSYNCTARGET/Everything" --delete-after`
		`-`
		`- $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"`
		`- $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"`
		`+ --link-dest="$RSYNCTARGET/Everything" \`
		`+ --delete-after`

		`- # hardlink content (this will hardlink aarch64 with the other arches)`
		`- time hardlink -v "$RSYNCTARGET/.."`
		`-`
		`- # Sync the content to /pub/alt`
		`- if [ ! -d "$RSYNCALTTARGET" ]; then`
		`- mkdir "$RSYNCALTTARGET"`
		`- fi`
		`- # labs artefacts are alternative`
		`- $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 \`
		`- "$DESTDIR" "$RSYNCALTTARGET/" \`
		`- --variant Labs \`
		`- --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata`
		`- $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 \`
		`- "$DESTDIR" "$RSYNCALTTARGET/" \`
		`- --variant Labs \`
		`- --link-dest="$RSYNCTARGET/Everything/" --delete-after`
		`- $RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo"`
		`- $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"`
		`+ $RSYNCPREFIX rm -f "$RSYNCTARGET/.composeinfo"`
		`+ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"`

		`# hardlink content (this will hardlink aarch64 with the other arches)`
		`time hardlink -v "$RSYNCTARGET/.."`

		`- # Sync the content to /pub/fedora-secondary`
		`- if [ ! -d "$RSYNCSECTARGET" ]; then`
		`- mkdir "$RSYNCSECTARGET"`
		`- fi`
		`- # all ppc64le/s390x artefacts are secondary`
		`- $RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \`
		`- "$DESTDIR" "$RSYNCSECTARGET/" \`
		`- --variant Everything --variant Cloud --variant Container \`
		`- --variant Labs --variant Server --variant Spins --variant Workstation \`
		`- --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata`
		`- $RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \`
		`- "$DESTDIR" "$RSYNCSECTARGET/" \`
		`- --variant Everything --variant Cloud --variant Container \`
		`- --variant Labs --variant Server --variant Spins --variant Workstation \`
		`- --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after`
		`-`
		`- $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"`
		`- $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"`
		`-`
		`- # hardlink content (this will hardlink ppc64le/s390x)`
		`- time hardlink -v "$RSYNCSECTARGET/.."`
		`-`
		`- # sync Silverblue, Kinoite, Sericea, and Onyx to the unified ostree repo`
		`- # Set the umask to so directories can get group write`
		`- # https://pagure.io/releng/issue/8811`
		`- old_umask=$(umask)`
		`- umask 0002`
		`- for variant in 'silverblue' 'kinoite' 'sericea' 'onyx'; do`
		`- for arch in x86_64 ppc64le aarch64; do`
		`- ref="fedora/rawhide/${arch}/${variant}"`
		`- if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi`
		`-`
		`- ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"`
		`- ostree summary -u --repo=$OSTREEDESTREPO # update summary file`
		`- done`
		`- done`
		`- # Set to old umask`
		`- umask $old_umask`
		`-`
		`- # Push rawhide base container image to fedora registry`
		`- # Push rawhide ostree base container image to fedora registry`
		`- pushd ./releng`
		`- pushd ./scripts`
		`- ./sync-latest-container-base-image.sh 42`
		`- ./sync-ostree-base-containers.sh 42`
		`- popd`
		`- popd`
		`-`
		`# Tell interested persons that the rsync is done.`
		`send_fedora_message "${fedora_message_json_done}" ${RELEASE} rsync.complete`

		`@@ -233,7 +122,7 @@`
		`# Tell everyone by email about the compose`
		`# "$DESTDIR/logs/depcheck" lets not cat out depcheck for now as it does`
		`# not understand rich dependencies`
		`- SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'`
		`+ SUBJECT="Fedora EPEL $RELEASE compose report: $SHORTCOMPOSE_ID changes"`
		`for tomail in $TOMAIL ; do`
		`cat $DESTDIR/logs/*verbose \| \`
		`mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail`

release-candidate.sh

file removed

-228

		`@@ -1,228 +0,0 @@`
		`- #!/bin/sh`
		`- # This script is used to generate Beta and Final release candidate composes.`
		`- # Relevant SOPs:`
		`- # Beta RC: https://docs.fedoraproject.org/en-US/infra/release_guide/beta_RC_compose/`
		`- # Final RC: https://docs.fedoraproject.org/en-US/infra/release_guide/final_RC_compose/`
		`- # It can be run in dry mode by adding the -d option.`
		`- # The -d option is a POSITIONAL argument and must be added AFTER the label.`
		- # Example usage: `./release-candidate.sh 39_Beta-1.3 -d`
		`- export LC_ALL=C`
		`- # Remove the label from arguments. It gets special treatment.`
		- # Other arguments to the script are passed to `pungi-koji` directly.
		`- LABEL=$1`
		`- shift`
		`-`
		`- # Find out which config file to use based on the label.`
		`- if [[ "$LABEL" = "Beta" ]]; then`
		`- CONFIG="fedora-beta.conf"`
		`- echo "========================================"`
		`- echo "CONFIG: $CONFIG"`
		`- echo ""`
		`- elif [[ "$LABEL" = "RC" ]]; then`
		`- CONFIG="fedora-final.conf"`
		`- echo "========================================"`
		`- echo "CONFIG: $CONFIG"`
		`- echo ""`
		`- else`
		`- echo "ERROR: Invalid label."`
		`- exit 1`
		`- fi`
		`-`
		`- # Extract the Fedora version from the label. Example label: 39_RC-1.1`
		`- FEDORA_VERSION="${LABEL%%_*}"`
		`- TARGET_DIR="/mnt/koji/compose/${FEDORA_VERSION}"`
		`- MD_ARCHIVE_DIR="/mnt/koji/compose/metadata-archive"`
		`- SERIES_DIR="${MD_ARCHIVE_DIR}/series"`
		`- # OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=${TARGET_DIR}"`
		`- NIGHTLY=""`
		`- SKIP_PHASES="--skip-phase=productimg"`
		`- # DEST=$(pwd)`
		`- DATE=$(date "+%Y%m%d")`
		`- # Comps file nomenclature example: comps-f39.xml`
		`- # COMPSFILE="comps-f${FEDORA_VERSION}.xml"`
		`- TMPDIR=$(mktemp -d /tmp/fedoraRC."${DATE}".XXXX)`
		`- RELEASE="f${FEDORA_VERSION}"`
		`- SHORT="Fedora"`
		`- RSYNCPREFIX="sudo -u ftpsync"`
		`- RSYNCTARGET="/pub/alt/stage/${LABEL}"`
		`- # Uncomment and edit for resuming a failed compose, e.g. "COMPOSE_ID="Fedora-23-20150530.n.0"`
		`- # COMPOSE_ID="Fedora-23-20150530.n.0"`
		`-`
		`- # Find out if the dry run (-d) option was invoked.`
		`- DRY_RUN=false`
		`- while getopts 'd' opt; do`
		`- case "$opt" in`
		`- d) DRY_RUN=true ;;`
		`- *) echo "Error in command line parsing." >&2`
		`- exit 1`
		`- esac`
		`- done`
		`-`
		`- if "$DRY_RUN"; then`
		`- printf "THIS IS A DRY RUN.\n\n"`
		`- CMD_PREFIX="echo"`
		`- else`
		`- printf "THIS IS NOT A DRY RUN.\n\n"`
		`- CMD_PREFIX=''`
		`- fi`
		`-`
		`- echo "========================================"`
		`- echo "ASSUME THAT THE RELENG REPOSITORY IS AVAILABLE AND REBASE. CLONE IT IF IT'S NOT."`
		`- echo ""`
		`- if [ -d releng ]; then`
		`- $CMD_PREFIX pushd releng`
		`- $CMD_PREFIX git pull --rebase`
		`- $CMD_PREFIX popd`
		`- echo ""`
		`- else`
		`- $CMD_PREFIX git clone https://pagure.io/releng.git`
		`- echo ""`
		`- fi`
		`-`
		`- # Set up our fedora-messaging function using the releng repository definition.`
		`- # https://pagure.io/releng/blob/main/f/scripts/fedora-messaging.sh`
		`- FEDMSG_MODNAME="compose"`
		`- FEDMSG_CERTPREFIX="releng"`
		`- . ./releng/scripts/fedora-messaging.sh`
		`-`
		`- echo "========================================"`
		`- echo "ANNOUNCE THAT WE ARE STARTING (EVEN THOUGH THE COMPOSE_ID IS NOT YET KNOWN)."`
		`- echo ""`
		`-`
		`- fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "short": "%s"}' \`
		`- "$RELEASE" "$SHORT")`
		`- $CMD_PREFIX send_fedora_message "${fedora_message_json_start} ${RELEASE} start"`
		`- echo ""`
		`-`
		- # The `pungi-koji` script checks out the fedora-comps repository so this can be removed (commented out for now).
		`- #pushd "${TMPDIR}"`
		`- #git clone https://pagure.io/fedora-comps.git && {`
		`- # pushd fedora-comps`
		`- # make "${COMPSFILE}"`
		`- # cp "${COMPSFILE}" "${DEST}"/`
		`- # popd`
		`- #}`
		`- #popd`
		`- #echo ""`
		`-`
		`- 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} ${SKIP_PHASES} \`
		`- --label=${LABEL}"`
		`-`
		`- if [ -z "${COMPOSE_ID}" ]; then`
		`- CMD="${CMD_PREFIX} ${CMD} --target-dir=${TARGET_DIR}"`
		`- else`
		`- CMD="${CMD_PREFIX} ${CMD} --debug-mode --compose-dir=${TARGET_DIR}/${COMPOSE_ID}"`
		`- fi`
		`-`
		`- echo "========================================"`
		`- echo "RUN THE COMPOSE. EXIT IF THE EXIT STATUS IS NOT ZERO."`
		`- echo ""`
		`-`
		`- if ! time ${CMD}; then`
		`- echo "ERROR: Command failed with a non-zero exit status."`
		`- "$CMD_PREFIX" exit 1`
		`- echo ""`
		`- fi`
		`- echo ""`
		`-`
		`- # Check if the compose ID exists and exit if it does not.`
		`- if [ ! -f "${TARGET_DIR}"/latest-$SHORT-"${FEDORA_VERSION}"/COMPOSE_ID ]; then`
		`- echo "ERROR: No compose ID available."`
		`- "$CMD_PREFIX" exit 1`
		`- echo ""`
		`- fi`
		`-`
		`- # Get the compose ID if it exists, exit if it does not.`
		`- # Note: The COMPOSE_ID variable is used for debugging purposes so another variable with the same value is needed.`
		`- if [ -e "${TARGET_DIR}"/latest-$SHORT-"${FEDORA_VERSION}"/COMPOSE_ID ]; then`
		`- COMPOSE_ID_2=$(cat "${TARGET_DIR}"/latest-$SHORT-"${FEDORA_VERSION}"/COMPOSE_ID)`
		`- else`
		`- echo "ERROR: Compose ID not found."`
		`- "$CMD_PREFIX" exit 1`
		`- echo ""`
		`- fi`
		`-`
		`- # Check if the compose STATUS exists and exit if it does not.`
		`- if [ ! -f "/mnt/koji/compose/${FEDORA_VERSION}/${COMPOSE_ID_2}/STATUS" ]; then`
		`- echo "ERROR: No compose STATUS available."`
		`- "$CMD_PREFIX" exit 1`
		`- echo ""`
		`- fi`
		`-`
		`- # Find out what the status of the compose is. Do not proceed if the status is DOOMED.`
		`- COMPOSE_STATUS=$(cat "/mnt/koji/compose/${FEDORA_VERSION}/${COMPOSE_ID_2}/STATUS")`
		`- echo "========================================"`
		`- echo "COMPOSE DETAILS"`
		`- echo "Compose ID: ${COMPOSE_ID_2}"`
		`- echo "Compose status: ${COMPOSE_STATUS}"`
		`- if [ "$COMPOSE_STATUS" = "DOOMED" ]; then`
		`- echo "ERROR: The compose status is DOOMED."`
		`- "$CMD_PREFIX" exit 1`
		`- echo ""`
		`- else`
		`- echo "Proceeding to rsync."`
		`- echo ""`
		`- fi`
		`-`
		`- # Update the fedora_message template.`
		`- fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "short": "%s", "compose_id": "%s"}' \`
		`- "$RELEASE" "$SHORT" "$COMPOSE_ID_2")`
		`- fedora_message_json_done=$(printf '{"log": "done", "branch": "%s", "short": "%s", "compose_id": "%s"}' \`
		`- "$RELEASE" "$SHORT" "$COMPOSE_ID_2")`
		`-`
		`- echo "========================================"`
		`- echo "LET INTERESTED PERSONS KNOW ABOUT THE COMPOSE."`
		`- echo ""`
		`- $CMD_PREFIX send_fedora_message "${fedora_message_json_done} ${RELEASE} complete"`
		`- echo ""`
		`-`
		`- echo "========================================"`
		`- echo "TELL INTERESTED PERSONS THAT THE RSYNC IS STARTING."`
		`- echo ""`
		`- $CMD_PREFIX send_fedora_message "${fedora_message_json_start} ${RELEASE} rsync.start"`
		`- echo ""`
		`-`
		`- echo "========================================"`
		`- echo "CREATE THE DIRECTORY TARGETED FOR THE COPY (IF IT DOESN'T EXIST)."`
		`- echo ""`
		`- if [ ! -d "${RSYNCTARGET}" ]; then`
		`- "${CMD_PREFIX}" "${RSYNCPREFIX}" mkdir -m 750 -p "${RSYNCTARGET}"`
		`- fi`
		`- echo ""`
		`-`
		`- echo "========================================"`
		`- echo "RUN THE SYNCHRONIZATION."`
		`- echo ""`
		`- ARTIFACTS="Everything Cloud Container Kinoite Labs Server Silverblue Spins \`
		`- Workstation Onyx Sericea metadata"`
		`-`
		`- for dir in ${ARTIFACTS}; do`
		`- ${CMD_PREFIX} "${RSYNCPREFIX} sh -c rsync -avhH ${TARGET_DIR}/${COMPOSE_ID_2}/compose/$dir/ \`
		`- ${RSYNCTARGET}/$dir/ --link-dest=/pub/fedora/linux/development/${FEDORA_VERSION}/Everything/ \`
		`- --link-dest=${RSYNCTARGET}/Everything"`
		`- done`
		`- echo ""`
		`-`
		`- echo "========================================"`
		`- echo "SET THE PERMISSIONS OF THE SYNCED COMPOSE."`
		`- echo ""`
		`- if [ -d "${RSYNCTARGET}" ]; then`
		`- "${CMD_PREFIX}" "${RSYNCPREFIX}" chmod 755 "${RSYNCTARGET}"`
		`- fi`
		`- echo ""`
		`-`
		`- # Copy the metadata to the non-garbage-collected metadata archive`
		`- YEAR=$(echo $COMPOSE_ID_2\|sed -e 's\|Fedora-.*-\|\|g'\|cut -c1-4)`
		`- mkdir -p "${MD_ARCHIVE_DIR}/${YEAR}/${COMPOSE_ID_2}"`
		`- cp "${DESTDIR}"/compose/metadata/*.json "${MD_ARCHIVE_DIR}/${YEAR}/${COMPOSE_ID_2}/"`
		`- # Add the compose ID to the 'series' file which records the`
		`- # compose IDs for each SHORT name in order`
		`- mkdir -p "${SERIES_DIR}"`
		`- echo "${COMPOSE_ID_2}" >> "${SERIES_DIR}/${SHORT}-${RELEASE}"`
		`-`
		`- echo "========================================"`
		`- echo "LET INTERESTED PERSONS KNOW THAT THE RSYNC IS COMPLETE."`
		`- echo ""`
		`- $CMD_PREFIX send_fedora_message "${fedora_message_json_done} ${RELEASE} rsync.complete"`

variants-fedora.xml

file removed

-101

		`@@ -1,101 +0,0 @@`
		`- <?xml version="1.0" encoding="UTF-8"?>`
		`- <!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">`
		`- <variants>`
		`- <variant id="Cloud" name="Cloud" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>ppc64le</arch>`
		`- <arch>s390x</arch>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Container" name="Container" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>ppc64le</arch>`
		`- <arch>s390x</arch>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Everything" name="Everything" type="variant">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>ppc64le</arch>`
		`- <arch>s390x</arch>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Labs" name="Labs" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Server" name="Server" type="variant">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>ppc64le</arch>`
		`- <arch>s390x</arch>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- <groups>`
		`- <group default="true">guest-agents</group>`
		`- <group default="true">standard</group>`
		`- <group default="true">core</group>`
		`- <group default="true">hardware-support</group>`
		`- <group default="true">networkmanager-submodules</group>`
		`- <group default="true">^server-product-environment</group>`
		`- <group default="true">server-product</group>`
		`- <group default="true">headless-management</group>`
		`- <group default="true">container-management</group>`
		`- <group default="true">domain-client</group>`
		`- <group default="true">server-hardware-support</group>`
		`- <group default="true">arm-tools</group>`
		`- <!-- Things needed for installation -->`
		`- <group default="true">anaconda-tools</group>`
		`- <group default="true">platform-vmware</group>`
		`- </groups>`
		`- <environments>`
		`- <environment display_order="2">server-product-environment</environment>`
		`- <environment display_order="99">custom-environment</environment>`
		`- </environments>`
		`- </variant>`
		`- <variant id="Spins" name="Spins" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Workstation" name="Workstation" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>x86_64</arch>`
		`- <arch>ppc64le</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Silverblue" name="Silverblue" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>x86_64</arch>`
		`- <arch>ppc64le</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Kinoite" name="Kinoite" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>x86_64</arch>`
		`- <arch>ppc64le</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Sericea" name="Sericea" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- </variant>`
		`- <variant id="Onyx" name="Onyx" type="variant" is_empty="true">`
		`- <arches>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- </variant>`
		`- </variants>`

variants.xml

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ <?xml version="1.0" encoding="UTF-8"?>`
		`+ <!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">`
		`+ <variants>`
		`+ <variant id="Everything" name="Everything" type="variant">`
		`+ <arches>`
		`+ <arch>aarch64</arch>`
		`+ <arch>ppc64le</arch>`
		`+ <arch>s390x</arch>`
		`+ <arch>x86_64</arch>`
		`+ </arches>`
		`+ </variant>`
		`+ </variants>`

carlwgeorge commented 8 months ago

https://pagure.io/releng/issue/12256

kevin commented 8 months ago

This looks pretty good to me.

I think we can merge, then perhaps run a manual compose with this before we enable it fully (and we will need to make sure to avoid running at the same time as the bodhi compose).

I suppose if we want to be even more carefull, we could comment the sync part, do a test compose, examine it and if it all looks good enable the sync and disable the bodhi part?

carlwgeorge commented 8 months ago

That all works for me.

jnsamyak commented 7 months ago

+1 to kevin's review, /lgtm as well!

rebased onto 9a7a2c3

7 months ago

carlwgeorge commented 7 months ago

I tested this by extracting the pungi-koji command to verify the pungi config, and that worked to get a successful compose. Then I ran the entire script with an alternate RSYNCTARGET, and that also worked. I'm confident in the current state and ready to merge.

adamwill commented 7 months ago

this is the first time we've had composes that publish fedora-messaging messages whose compose ID doesn't start with "Fedora" (or, briefly, "FACD"). I know because a couple of my services started logging errors about it. :P It might surprise other things, I dunno how many other things we have that listen out to compose messages.

carlwgeorge commented 7 months ago

I have no problem changing the ID from EPEL to Fedora-EPEL if you think that's best.

rebased onto 9a7a2c3

7 months ago

carlwgeorge commented 7 months ago

Adjusted to use release_short = 'Fedora-EPEL' per discussions in matrix.

kevin commented 7 months ago

Lets go.