toolbox: should be blocking

I marked toolbox as failable when we were getting everthing working on
it (and so we would still have composes). Now that it's working, lets
mark it blocking again.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

README.rst

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

cloud-nightly.sh

@@ -0,0 +1,82 @@
+#!/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"
+#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="40"
+RELEASE_TITLE="40"
+COMPSFILE="comps-f40.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
+
+find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

container-nightly.sh

@@ -0,0 +1,80 @@
+#!/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"
+#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="40"
+RELEASE_TITLE="40"
+COMPSFILE="comps-f40.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
+
+find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

epel8-playground-nightly.sh

@@ -1,76 +0,0 @@
-#!/bin/sh
-
-
-export LC_ALL=C
-
-CONFIG="epel8-playground.conf"
-TARGET_DIR="/mnt/koji/compose/epel"
-NIGHTLY="--nightly"
-SKIP_PHASES="--skip-phase=productimg"
-DATE=$(date "+%Y%m%d")
-SHORT="Fedora-Epel-Playground"
-RELEASE="8"
-TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
-OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE/COMPOSE_ID)
-RSYNCPREFIX="sudo -u ftpsync"
-RSYNCTARGET="/pub/epel/playground/$RELEASE"
-
-# 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_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..
-fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
-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 $SKIP_PHASES"
-
-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/COMPOSE_ID)
-DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
-LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
-
-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")
-
-send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
-if [ ! -d "$RSYNCTARGET" ]; then
-  mkdir "$RSYNCTARGET"
-fi
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=ppc64le --arch=s390x --arch=x86_64 --arch src \
-    "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --exclude=repodata
-
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=ppc64le --arch=s390x --arch=x86_64 --arch src \
-    "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --delete-after
-
-send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
-
-# Tell everyone by fedmsg about the compose
-send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
-
-# Removed all the older than 14 days composes
-find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;
-send_fedmsg "${fedmsg_json_done}" ${RELEASE} cleanup.complete

epel8-playground.conf

@@ -1,118 +0,0 @@
-# PRODUCT INFO
-release_name = 'Fedora-Epel'
-release_short = 'Fedora-Epel-Playground'
-release_version = '8'
-release_is_layered = False
-
-# GENERAL SETTINGS
-comps_file = {
-    'scm': 'git',
-    'repo': 'https://pagure.io/fedora-comps.git',
-    'branch': 'main',
-    'file': 'comps-epel8.xml',
-    'command': 'make comps-epel8.xml'
-}
-module_defaults_dir = {
-    'scm': 'git',
-    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
-    'branch': 'main',
-    'dir': '.'
-}
-
-variants_file='variants-fedora.xml'
-sigkeys = ['2f86d6a1']
-
-hashed_directories = True
-
-## PDC settings
-pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
-pdc_insecure = False
-# This option will skip getting an authentication token via Kerberos.
-pdc_develop = True
-
-# PKGSET
-pkgset_source = 'koji' # koji, repos
-
-# PKGSET - KOJI
-pkgset_koji_tag = 'epel8-playground'
-pkgset_koji_inherit = False
-filter_system_release_packages = False
-
-# GATHER
-gather_method = {
-    '^.*': {                # For all variants
-        'comps': 'deps',    # resolve dependencies for packages from comps file
-        'module': 'nodeps', # but not for packages from modules
-    }
-}
-gather_backend = 'dnf'
-gather_profiler = True
-check_deps = False
-greedy_method = 'build'
-repoclosure_backend = 'dnf'
-
-# CREATEREPO
-createrepo_deltas = False
-createrepo_database = True
-
-#jigdo
-create_jigdo = False
-
-# fomat: [(variant_uid_regex, {arch|*: [packages]})]
-additional_packages = [
-    ('^Everything$', {
-        '*': [
-            '*',
-        ],
-    }),
-]
-
-multilib = [
-    ('^Everything$', {
-        'x86_64': ['devel', 'runtime'],
-        's390x': ['devel', 'runtime']
-    })
-]
-
-filter_packages = [
-]
-
-
-# format: {arch|*: [packages]}
-multilib_blacklist = {
-    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
-        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
-        'php-devel', 'java-*',
-        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
-        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
-    ],
-}
-
-
-# format: {arch|*: [packages]}
-multilib_whitelist = {
-    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
-        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
-        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
-        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
-        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
-        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
-        'mariadb-connector-odbc', 'compiler-rt',
-        'nvidia-query-resource-opengl-lib',
-        'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',
-        'glib-networking'
-    ],
-}
-
-createiso_skip = [
-        ('^Everything$', {
-            '*': True,
-            'src': True
-        }),
-    ]
-
-koji_profile = 'compose_koji'
-
-translate_paths = [
-   ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
-]

fedora-cloud.conf

@@ -0,0 +1,202 @@
+# 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 = '40'
+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-f40.xml',
+    'command': 'make comps-f40.xml'
+}
+variants_file='variants-fedora.xml'
+sigkeys = ['a15B79cc'] # None = unsigned
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+tree_variants = ['Cloud']
+# PKGSET
+pkgset_koji_tag = 'f40-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)$', {
+        '*': [
+        'kernel*debug*',
+        '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'
+     ]
+image_build = {
+    '^Cloud$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Cloud-Base',
+                    'target': 'f40',
+                    'version': '40',
+                    'release': None,
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': [
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 
+                    ],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'target': 'f40',
+                    'version': '40',
+                    'release': None,
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': [
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 
+                    ],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
+                    'subvariant': 'Cloud_Base',
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vpc','vpc')],
+                    'name': 'Fedora-Cloud-Base-Azure',
+                    'target': 'f40',
+                    'version': '40',
+                    'release': None,
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
+                    'kickstart': 'fedora-cloud-base-azure.ks',
+                    'distro': 'Fedora-30',
+                    'disk_size': 10,
+                    'arches': ['aarch64', 'x86_64'],
+                    'repo': [
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 
+                    ],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        ],
+}
+koji_profile = 'compose_koji'

fedora-container.conf

@@ -0,0 +1,213 @@
+# 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 = '40'
+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-f40.xml',
+    'command': 'make comps-f40.xml'
+}
+sigkeys = ['a15B79cc'] # None = unsigned
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+tree_variants = ['Container']
+# PKGSET
+pkgset_koji_tag = 'f40-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)$', {
+        '*': [
+        'kernel*debug*',
+        '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 and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40'
+global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
+global_version = '40'
+global_target = 'f40'
+
+image_build = {
+    '^Container$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Base',
+                    'kickstart': 'fedora-container-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
+                    'repo': [
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
+                    ],
+                    'subvariant': 'Container_Base'
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
+            },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-container-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
+                    'repo': [
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
+                    ],
+                    'subvariant': 'Container_Minimal_Base',
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
+            },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Toolbox',
+                    'kickstart': 'fedora-container-toolbox.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
+                    'repo': [
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
+                    ],
+                    'subvariant': 'Container_Toolbox',
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
+            },
+        }
+        ],
+}
+koji_profile = 'compose_koji'

general.conf

@@ -0,0 +1,83 @@
+# 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 = 'f40-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',
+          'MATE_Compiz': 'MATE',
+                 '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

@@ -0,0 +1,84 @@
+# 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',
+        'kernel*debug*',
+        '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',
+        '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',
+        'p11-kit-trust',
+        'pam',
+        'perl-libs',
+        'pipewire',
+        'postgresql-odbc',
+        'redhat-lsb',
+        'syslinux-extlinux-nonlinux',
+        'syslinux-nonlinux',
+        'syslinux-tftpboot',
+        'systemd-pam',
+        'valgrind',
+        'vkBasalt',
+        'wine',
+        'wine-*',
+        'yaboot',
+    ],
+}

nightly.sh

@@ -0,0 +1,242 @@
+#!/bin/sh
+
+
+export LC_ALL=C
+
+CONFIG="fedora.conf"
+TARGET_DIR="/mnt/koji/compose/rawhide"
+#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
+NIGHTLY="--nightly"
+SKIP_PHASES=""
+DEST=$(pwd)
+DATE=$(date "+%Y%m%d")
+SHORT="Fedora"
+RELEASE="rawhide"
+RELEASE_TITLE="Rawhide"
+COMPSFILE="comps-rawhide.xml"
+TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
+TOMAIL="devel@lists.fedoraproject.org test-reports@lists.fedoraproject.org"
+FROM="Fedora Rawhide 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)
+# 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 fedora messaging function, using the releng repo definition
+FEDMSG_MODNAME="compose"
+FEDMSG_CERTPREFIX="releng"
+. ./releng/scripts/fedora-messaging.sh
+
+# Announce that we are starting, even though we don't know the compose_id yet..
+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"
+
+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 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"
+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
+if [ ! -d "$RSYNCTARGET" ]; then
+  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 \
+    "$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 \
+    "$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"
+
+# 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"
+
+# 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 40
+./sync-ostree-base-containers.sh 40
+popd
+popd
+
+# Tell interested persons that the rsync is done.
+send_fedora_message "${fedora_message_json_done}" ${RELEASE} rsync.complete
+
+# Tell everyone by fedora_message about the compose
+send_fedora_message "${fedora_message_json_done}" ${RELEASE} complete
+
+# 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'
+for tomail in $TOMAIL ; do
+    cat $DESTDIR/logs/*verbose  | \
+         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+done
+
+# Removed all the older than 14 days composes
+find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;
+send_fedora_message "${fedora_message_json_done}" ${RELEASE} cleanup.complete

release-candidate.sh

@@ -0,0 +1,76 @@
+#!/bin/sh
+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
+CONFIG="fedora-final.conf"
+FEDORA_VERSION="${LABEL%%_*}"
+TARGET_DIR="/mnt/koji/compose/${FEDORA_VERSION}"
+#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")
+COMPSFILE="comps-f39.xml"
+TMPDIR=$(mktemp -d /tmp/fedoraRC."${DATE}".XXXX)
+RELEASE="f39"
+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"
+
+# Set up our fedora messaging function, using the releng repo definition
+FEDMSG_MODNAME="compose"
+FEDMSG_CERTPREFIX="releng"
+. ./releng/scripts/fedora-messaging.sh
+
+# Announce that we are starting, even though we don't know the compose_id yet..
+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
+
+# Public URL the synced compose will wind up at, we put them in fedora-messaging
+LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
+
+# Update fedora_message template
+fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location"}' "$RELEASE" "$ARCH" "$SHORT" "$LOCATION")
+fedora_message_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$LOCATION")
+
+pushd "${TMPDIR}"
+git clone https://pagure.io/fedora-comps.git && {
+    pushd fedora-comps
+    make "${COMPSFILE}"
+    cp "${COMPSFILE}" "${DEST}"/
+    popd
+}
+popd
+
+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} --target-dir=${TARGET_DIR}"
+else
+    CMD="${CMD} --debug-mode --compose-dir=${TARGET_DIR}/${COMPOSE_ID}"
+fi
+
+time "$CMD" "$@"
+
+# Tell interested persons that the rsync is starting
+send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start
+
+if [ ! -d "${RSYNCTARGET}" ]; then
+    $(RSYNCPREFIX) mkdir -m 750 -p "${RSYNCTARGET}"
+fi
+
+# Note from documentation:
+# If multiple composes are run like 1.2, 1.3, add multiple --link-dest arguments above with multiple composes
+${RSYNCPREFIX} sh -c 'for dir in Everything Cloud Container Kinoite Labs Modular Server Silverblue Spins Workstation Onyx Sericea metadata; do rsync -avhH ${TARGET_DIR}/${COMPOSE_ID}/compose/$dir/ ${RSYNCTARGET}/$dir/ --link-dest=/pub/fedora/linux/development/${FEDORA_VERSION}/Everything/ --link-dest=${RSYNCTARGET}/Everything/; done'
+
+${RSYNCPREFIX} chmod 755 "${RSYNCTARGET}"
+
+# Let interested persons know the rsync is complete
+send_fedora_message "${fedora_message_json_done}" ${RELEASE} rsync.complete

variants-fedora.xml

@@ -1,7 +1,7 @@
 <?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">
+    <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
             <arch>ppc64le</arch>
@@ -9,4 +9,100 @@
             <arch>x86_64</arch>
         </arches>
     </variant>
+    <variant id="Container" name="Container" type="variant" is_empty="true">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>armhfp</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>armhfp</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>armhfp</arch>
+            <arch>x86_64</arch>
+        </arches>
+    </variant>
+    <variant id="Server" name="Server" type="variant">
+        <arches>
+            <arch>armhfp</arch>
+            <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>armhfp</arch>
+            <arch>x86_64</arch>
+        </arches>
+    </variant>
+    <variant id="Workstation" name="Workstation" type="variant" is_empty="true">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>armhfp</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>
+            <arch>ppc64le</arch>
+        </arches>
+    </variant>
+    <variant id="Onyx" name="Onyx" type="variant" is_empty="true">
+        <arches>
+            <arch>x86_64</arch>
+        </arches>
+    </variant>
 </variants>