Merge #281 `fix the docker_label entry to be a valid JSON string`

The script gets a label as a command line argument, and this is manually
handled by adding it as `--label=$1` to the pungi-koji command. We
should not add this argument to another time.

This avoid problem with Pungi 4.1.17 which reports an error when seeing
unknown arguments (which were silently ignored before).

Fixes: https://pagure.io/pungi/issue/682
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

cloud-nightly.sh

@@ -0,0 +1,109 @@
+#!/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/"
+#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
+NIGHTLY=""
+SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"
+DEST=$(pwd)
+DATE=$(date "+%Y%m%d")
+DIST="25"
+BRANCHED="25"
+BRANCH="branched"
+COMPSFILE="comps-f25.xml"
+GIT_BRANCH="f25"
+TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
+TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
+FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
+RSYNCPREFIX="sudo -u ftpsync"
+ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
+ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
+ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-25/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"}' "$BRANCHED" "$ARCH")
+fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
+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}" ${DIST} start
+
+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 --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 "$@"
+if [ "$?" = "0" ]; then
+   export mail=0
+fi
+
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-25/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
+$RSYNCPREFIX mkdir -p $DESTDIR
+
+# Tell interested persons that the rsync is starting (zomg!)
+send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
+
+#for dir in CloudImage metadata ;
+#  do
+#    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
+#  done
+
+# Tell interested persons that the rsync is done.
+#send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
+
+# Tell everyone by fedmsg about the compose
+send_fedmsg "${fedmsg_json_done}" ${DIST} complete
+
+# Tell everyone by email about the compose
+SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
+#if [ "$mail" = "0" ]; then
+#    for tomail in $TOMAIL ; do
+#        cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
+#             mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+#    done
+#fi
+
+# Remove old composes older than 21 days
+
+find $TARGET_DIR/Fedora-Cloud-25-* -xdev -depth -maxdepth 2 -mtime +21  -exec rm -rf {} \;

docker-nightly.sh

@@ -0,0 +1,111 @@
+#!/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-docker.conf"
+TARGET_DIR="/mnt/koji/compose/"
+#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
+NIGHTLY=""
+SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"
+DEST=$(pwd)
+DATE=$(date "+%Y%m%d")
+DIST="25"
+BRANCHED="25"
+BRANCH="branched"
+COMPSFILE="comps-f25.xml"
+GIT_BRANCH="f25"
+TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
+TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
+FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
+RSYNCPREFIX="sudo -u ftpsync"
+ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
+ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
+ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-25/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"}' "$BRANCHED" "$ARCH")
+fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
+FEDMSG_MODNAME="compose"
+FEDMSG_CERTPREFIX="releng"
+. ./releng/scripts/fedmsg-functions.sh
+
+# Announce that we are starting...
+send_fedmsg "${fedmsg_json_start}" ${DIST} start
+
+
+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 --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 "$@"
+if [ "$?" = "0" ]; then
+   export mail=0
+fi
+
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-25/COMPOSE_ID)
+SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
+
+
+DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
+$RSYNCPREFIX mkdir -p $DESTDIR
+
+# Tell interested persons that the rsync is starting (zomg!)
+
+send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
+
+#for dir in Docker metadata ;
+#  do
+#    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
+#  done
+
+
+# Tell interested persons that the rsync is done.
+
+#send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
+
+# Tell everyone by fedmsg about the compose
+
+send_fedmsg "${fedmsg_json_done}" ${DIST} complete
+
+SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
+#if [ "$mail" = "0" ]; then
+#    for tomail in $TOMAIL ; do
+#        cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
+#             mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+#    done
+#fi
+
+# Remove old composes older than 21 days
+
+find $TARGET_DIR/Fedora-Docker-25-* -xdev -depth -maxdepth 2 -mtime +21  -exec rm -rf {} \;

fedora-alpha.conf

@@ -0,0 +1,552 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '25'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+keep_original_comps = ['Everything']
+
+variants_file='variants-fedora.xml'
+sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['i386', 'x86_64', 'armhfp']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+#runroot_channel = 'fedora_compose'
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_path_prefix = '/mnt/koji/'
+pkgset_koji_url = 'http://koji.fedoraproject.org/kojihub'
+pkgset_koji_tag = 'f25-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# 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'
+
+
+link_files = 'hardlink-or-copy'
+
+notification_script = '/usr/bin/pungi-fedmsg-notification'
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(label)s-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#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$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        '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'
+    ],
+}
+
+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 = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(label)s.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25'
+global_release = "2"
+global_version = '25_Alpha'
+# live_images ignores this in favor of live_target
+global_target = 'f25'
+
+image_build = {
+    '^Docker$': [
+        {
+            'failable': ['*'],
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['x86_64', 'armhfp'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Docker_Base'
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'failable': ['*'],
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        {
+            'failable': ['*'],
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                     }
+        }
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso', 'live'],
+    })
+]
+
+live_target = 'f25'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },]
+    }),
+]
+
+
+release_id_allow_missing = True
+koji_profile = 'compose_koji'

fedora-atomic.conf

@@ -0,0 +1,284 @@
+# PRODUCT INFO
+release_name = 'Fedora-Atomic'
+release_short = 'Fedora-Atomic'
+release_version = '25'
+release_is_layered = False
+# GENERAL SETTINGS
+bootable = True
+buildinstall_method = 'lorax'
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': True
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'git://git.fedorahosted.org/git/comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+variants_file='variants-fedora.xml'
+sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['x86_64']
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+tree_variants = ['Atomic', 'Cloud', 'CloudImages']
+hashed_directories = True
+# RUNROOT settings
+runroot = True
+#runroot_channel = 'fedora_compose'
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+pkgset_koji_tag = 'f25-atomic'
+pkgset_koji_inherit = True
+filter_system_release_packages = False
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+# 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_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'
+#jigdo
+create_jigdo = False
+#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$', {
+        '*': [
+        ],
+    }),
+]
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        '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'
+    ],
+}
+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'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+image_build = {
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Atomic',
+                    'target': 'f25',
+                    'version': '25',
+                    'release': None,
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25',
+                    'kickstart': 'fedora-atomic.ks',
+                    'distro': 'Fedora-20',
+                    'disk_size': 6,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'repo': [
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$arch/',
+                    ],
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Atomic-Vagrant',
+                    'target': 'f25',
+                    'version': '25',
+                    'release': None,
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25',
+                    'kickstart': 'fedora-atomic-vagrant.ks',
+                    'distro': 'Fedora-20',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'repo': [
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$arch/',
+                    ],
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic'
+                     }
+        }
+        ],
+}
+ostree_installer = [
+    ("^Atomic$", {
+        "x86_64": {
+            "source_repo_from": [ "Cloud",
+                                  "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/25/Everything/$arch/os/"],
+            "release": None,
+            "installpkgs": ["fedora-productimg-atomic"],
+            "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/25/",
+                "ostree_osname=fedora-atomic",
+                "ostree_install_ref=fedora-atomic/25/x86_64/updates/docker-host",
+                "ostree_update_ref=fedora-atomic/25/x86_64/docker-host",
+            ],
+            "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/25/",
+                "ostree_osname=fedora-atomic",
+                "ostree_install_ref=fedora-atomic/25/x86_64/updates/docker-host",
+                "ostree_update_ref=fedora-atomic/25/x86_64/docker-host",
+            ]
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f25',
+        }
+    })
+]
+koji_profile = 'compose_koji'

fedora-beta.conf

@@ -0,0 +1,580 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '25'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['i386', 'x86_64', 'armhfp']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+#runroot_channel = 'fedora_compose'
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f25-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# 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'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s_%(label)s-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#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$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        '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'
+    ],
+}
+
+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 = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s_%(label)s.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25'
+global_release = "1.1"
+global_version = '25_Beta'
+# live_images ignores this in favor of live_target
+global_target = 'f25'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['x86_64', 'armhfp'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Docker_Base'
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                     }
+        }
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso', 'live'],
+    })
+]
+
+live_target = 'f25'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },]
+    }),
+]
+
+ostree = [
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f25",
+            "source_repo_from": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/25/",
+            'failable': ['*'],
+        }
+    })
+]
+ostree_installer = [
+    ("^Workstation$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "installpkgs": ["fedora-productimg-workstation"],
+            "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/25/x86_64/workstation",
+            ],
+            "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/25/",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/25/x86_64/workstation",
+            ]
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f25',
+            'failable': ['*'],
+        }
+    })
+]
+
+
+koji_profile = 'compose_koji'

fedora-cloud.conf

@@ -0,0 +1,248 @@
+# PRODUCT INFO
+release_name = 'Fedora-Cloud'
+release_short = 'Fedora-Cloud'
+release_version = '25'
+release_is_layered = False
+# GENERAL SETTINGS
+bootable = False 
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'git://git.fedorahosted.org/git/comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+variants_file='variants-fedora.xml'
+sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['x86_64']
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+tree_variants = ['CloudImages']
+hashed_directories = True
+# RUNROOT settings
+runroot = True
+#runroot_channel = 'fedora_compose'
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+pkgset_koji_tag = 'f25-updates'
+pkgset_koji_inherit = True
+filter_system_release_packages = False
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+# 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_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'
+#jigdo
+create_jigdo = False
+#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$', {
+        '*': [
+        ],
+    }),
+]
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        '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'
+    ],
+}
+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'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+image_build = {
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'target': 'f25',
+                    'version': '25',
+                    'release': None,
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-20',
+                    'disk_size': 3,
+                    'arches': ['x86_64'],
+                    'repo': [
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$arch/',
+                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
+                    ],
+                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'target': 'f25',
+                    'version': '25',
+                    'release': None,
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'distro': 'Fedora-20',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': [
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$arch/',
+                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/'
+                    ],
+                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/25/Cloud/$arch/os/',
+                    'subvariant': 'Cloud_Base',
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                     }
+        },
+        ],
+}
+koji_profile = 'compose_koji'

fedora-docker.conf

@@ -0,0 +1,234 @@
+# PRODUCT INFO
+release_name = 'Fedora-Docker'
+release_short = 'Fedora-Docker'
+release_version = '25'
+release_is_layered = False
+# GENERAL SETTINGS
+bootable = False
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'git://git.fedorahosted.org/git/comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+variants_file='variants-fedora.xml'
+sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['x86_64', 'armhfp']
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+tree_variants = ['Docker']
+hashed_directories = True
+# RUNROOT settings
+runroot = True
+#runroot_channel = 'fedora_compose'
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+pkgset_koji_tag = 'f25-updates'
+pkgset_koji_inherit = True
+filter_system_release_packages = False
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+# 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_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'
+#jigdo
+create_jigdo = False
+#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$', {
+        '*': [
+        ],
+    }),
+]
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        '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'
+    ],
+}
+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'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Docker-Base',
+                    'target': 'f25',
+                    'version': '25',
+                    'release': None,
+                    # correct SHA1 hash will be put into the URL below automatically
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-20',
+                    'disk_size': 3,
+                    'arches': ['x86_64', 'armhfp'],
+                    'repo': [
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/25/$arch/',
+                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/25/Everything/$arch/os/',
+                    ],
+                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/25/Everything/$arch/os/',
+                    'subvariant': 'Docker_Base'
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "25"}',
+            },
+        }
+        ],
+}
+koji_profile = 'compose_koji'

fedora-final.conf

@@ -0,0 +1,580 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '25'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f25.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['i386', 'x86_64', 'armhfp']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+#runroot_channel = 'fedora_compose'
+runroot_channel = 'compose'
+runroot_tag = 'f25-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f25-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# 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'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.3-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#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$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+         's390x': ['devel', 'runtime']
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        '^kernel.*debug.*',
+        '^kernel-kdump.*',
+        '^kernel-tools.*',
+        '^syslog-ng.*',
+        '^astronomy-bookmarks',
+        '^generic.*',
+        '^GConf2-dbus.*',
+        '^bluez-gnome',
+        #Periods cause problems in paterns, so replace with *s
+        '^java-1.8.0-openjdk',
+        '^community-mysql.*',
+        '^jruby.*',
+        '^gimp-help-.*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        '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'
+    ],
+}
+
+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 = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.3.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25'
+global_release = "1.3"
+global_version = '25'
+# live_images ignores this in favor of live_target
+global_target = 'f25'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['x86_64', 'armhfp'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Docker_Base'
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 3,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base'
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'failable': ['*'],
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                     }
+        }
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        '*': ['buildinstall', 'iso', 'image-build', 'live-media', 'live', 'ostree', 'ostree-installer'],
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso', 'live'],
+    })
+]
+
+live_target = 'f25'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },]
+    }),
+]
+
+ostree = [
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f25",
+            "source_repo_from": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/25/",
+            'failable': ['*'],
+        }
+    })
+]
+ostree_installer = [
+    ("^Workstation$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "installpkgs": ["fedora-productimg-workstation"],
+            "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/25/x86_64/workstation",
+            ],
+            "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/25/",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/25/x86_64/workstation",
+            ]
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f25',
+            'failable': ['*'],
+        }
+    })
+]
+
+
+koji_profile = 'compose_koji'

fedora.conf

@@ -1,21 +1,20 @@
 # PRODUCT INFO
 release_name = 'Fedora'
 release_short = 'Fedora'
-release_version = 'Rawhide'
+release_version = '25'
 release_is_layered = False
 
 # GENERAL SETTINGS
 bootable = True
-comps_file = 'comps-rawhide.xml' #{
+comps_file = 'comps-f25.xml' #{
 #    'scm': 'git',
 #    'repo': 'https://pagure.io/fedora-comps.git',
 #    'branch': None, # defaults to cvs/HEAD or git/master
 #    'file': 'comps-f23.xml',
 #}
-keep_original_comps = ['Everything']
 
 variants_file='variants-fedora.xml'
-sigkeys = ['81B46521', '030D5AED', None] # None = unsigned
+sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
 
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
@@ -42,8 +41,6 @@ pkgset_source = 'koji' # koji, repos
 # pkgset_repos = {}
 
 # PKGSET - KOJI
-pkgset_koji_path_prefix = '/mnt/koji/'
-pkgset_koji_url = 'http://koji.fedoraproject.org/kojihub'
 pkgset_koji_tag = 'f25'
 pkgset_koji_inherit = False
 
@@ -63,10 +60,6 @@ greedy_method = 'build'
 #gather_source_mapping = '/path/to/mapping.json'
 
 
-link_files = 'hardlink-or-copy'
-
-notification_script = '/usr/bin/pungi-fedmsg-notification'
-
 # CREATEREPO
 createrepo_c = True
 createrepo_checksum = 'sha256'
@@ -88,7 +81,7 @@ lorax_options = [
   ('^.*$', {
      'x86_64': {
          'nomacboot': False
-     }
+     },
      '*': {
          'noupgrade': True
      }
@@ -275,9 +268,9 @@ translate_paths = [
 
 
 # These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f25'
 global_release = None
-global_version = 'Rawhide'
+global_version = '25'
 # live_images ignores this in favor of live_target
 global_target = 'f25'
 
@@ -285,7 +278,7 @@ image_build = {
     '^Docker$': [
         {
             'image-build': {
-                    'format': [('docker', 'tar.xz')]
+                    'format': [('docker', 'tar.xz')],
                     'name': 'Fedora-Docker-Base',
                     'kickstart': 'fedora-docker-base.ks',
                     'distro': 'Fedora-22',
@@ -293,14 +286,21 @@ image_build = {
                     'arches': ['x86_64', 'armhfp'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
-                    'subvariant': 'Docker_Base'
-                    }
-        }
+                    'subvariant': 'Docker_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr//bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f25container", "FGC=f25" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "25"}',
+            },
+        },
         ],
     '^CloudImages$': [
         {
             'image-build': {
-                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                     'name': 'Fedora-Cloud-Base',
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
@@ -308,12 +308,13 @@ image_build = {
                     'arches': ['x86_64'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
-                    'subvariant': 'Cloud_Base'
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
                      }
         },
         {
             'image-build': {
-                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
                     'name': 'Fedora-Cloud-Base-Vagrant',
                     'kickstart': 'fedora-cloud-base-vagrant.ks',
                     'distro': 'Fedora-22',
@@ -322,12 +323,13 @@ image_build = {
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base',
-                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync',
+                    'failable': ['*'],
                      }
         },
         {
             'image-build': {
-                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                     'name': 'Fedora-Atomic',
                     'kickstart': 'fedora-atomic.ks',
                     'distro': 'Fedora-22',
@@ -335,12 +337,13 @@ image_build = {
                     'arches': ['x86_64'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'subvariant': 'Atomic',
+                    'failable': ['*'],
                      }
         },
         {
             'image-build': {
-                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
                     'name': 'Fedora-Atomic-Vagrant',
                     'kickstart': 'fedora-atomic-vagrant.ks',
                     'distro': 'Fedora-22',
@@ -348,7 +351,8 @@ image_build = {
                     'arches': ['x86_64'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'subvariant': 'Atomic',
+                    'failable': ['*'],
                      }
         }
         ],
@@ -379,6 +383,7 @@ live_media = {
                 'name': 'Fedora-Xfce-Live',
                 'kickstart': 'fedora-live-xfce.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Xfce'
@@ -387,6 +392,7 @@ live_media = {
                 'name': 'Fedora-SoaS-Live',
                 'kickstart': 'fedora-live-soas.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'SoaS'
@@ -395,6 +401,7 @@ live_media = {
                 'name': 'Fedora-Cinnamon-Live',
                 'kickstart': 'fedora-live-cinnamon.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Cinnamon'
@@ -403,6 +410,7 @@ live_media = {
                 'name': 'Fedora-LXDE-Live',
                 'kickstart': 'fedora-live-lxde.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'LXDE'
@@ -411,6 +419,7 @@ live_media = {
                 'name': 'Fedora-MATE_Compiz-Live',
                 'kickstart': 'fedora-live-mate_compiz.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Mate'
@@ -421,6 +430,7 @@ live_media = {
                 'name': 'Fedora-Astronomy_KDE-Live',
                 'kickstart': 'fedora-live-astronomy_kde.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Astronomy_KDE'
@@ -429,6 +439,7 @@ live_media = {
                 'name': 'Fedora-Design_suite-Live',
                 'kickstart': 'fedora-live-design_suite.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Design_suite'
@@ -437,6 +448,7 @@ live_media = {
                 'name': 'Fedora-Scientific_KDE-Live',
                 'kickstart': 'fedora-live-scientific_kde.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Scientific_KDE'
@@ -445,6 +457,7 @@ live_media = {
                 'name': 'Fedora-Games-Live',
                 'kickstart': 'fedora-live-games.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Games'
@@ -453,6 +466,7 @@ live_media = {
                 'name': 'Fedora-Security-Live',
                 'kickstart': 'fedora-live-security.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Security'
@@ -461,6 +475,7 @@ live_media = {
                 'name': 'Fedora-Jam_KDE-Live',
                 'kickstart': 'fedora-live-jam_kde.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Jam_KDE'
@@ -469,6 +484,7 @@ live_media = {
                 'name': 'Fedora-Robotics-Live',
                 'kickstart': 'fedora-live-robotics.ks',
                 'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Robotics'
@@ -494,14 +510,16 @@ live_images = [
         'armhfp': {
                 'kickstart': 'fedora-arm-workstation.ks',
                 'name': 'Fedora-Workstation-armhfp',
-                'type': 'appliance'
+                'type': 'appliance',
+                'failable': True,
                 }
     }),
     ('^Server$', {
         'armhfp': {
                 'kickstart': 'fedora-arm-server.ks',
                 'name': 'Fedora-Server-armhfp',
-                'type': 'appliance'
+                'type': 'appliance',
+                'failable': True,
                 }
     }),
     ('^Spins$', {
@@ -510,42 +528,48 @@ live_images = [
                 'name': 'Fedora-KDE-armhfp',
                 'repo_from': 'Everything',
                 'type': 'appliance',
-                'subvariant': 'KDE'
+                'subvariant': 'KDE',
+                'failable': True,
                 },
                 {
                 'kickstart': 'fedora-arm-lxde.ks',
                 'name': 'Fedora-LXDE-armhfp',
                 'repo_from': 'Everything',
                 'type': 'appliance',
-                'subvariant': 'LXDE'
+                'subvariant': 'LXDE',
+                'failable': True,
                 },
                 {
                 'kickstart': 'fedora-arm-mate.ks',
                 'name': 'Fedora-Mate-armhfp',
                 'repo_from': 'Everything',
                 'type': 'appliance',
-                'subvariant': 'Mate'
+                'subvariant': 'Mate',
+                'failable': True,
                 },
                 {
                 'kickstart': 'fedora-arm-minimal.ks',
                 'name': 'Fedora-Minimal-armhfp',
                 'repo_from': 'Everything',
                 'type': 'appliance',
-                'subvariant': 'Minimal'
+                'subvariant': 'Minimal',
+                'failable': False,
                 },
                 {
                 'kickstart': 'fedora-arm-soas.ks',
                 'name': 'Fedora-SoaS-armhfp',
                 'repo_from': 'Everything',
                 'type': 'appliance',
-                'subvariant': 'SoaS'
+                'subvariant': 'SoaS',
+                'failable': True,
                 },
                 {
                 'kickstart': 'fedora-arm-xfce.ks',
                 'name': 'Fedora-Xfce-armhfp',
                 'repo_from': 'Everything',
                 'type': 'appliance',
-                'subvariant': 'Xfce'
+                'subvariant': 'Xfce',
+                'failable': True,
                 },]
     }),
 ]
@@ -555,16 +579,20 @@ ostree = [
         "x86_64": {
             "treefile": "fedora-atomic-docker-host.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f25",
             "source_repo_from": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/"
+            "ostree_repo": "/mnt/koji/compose/atomic/25/",
+            'failable': ['*'],
         }
     }),
     ("^ostree$", {
         "x86_64": {
-            "treefile": "fedora-ostree-workstation.json ",
+            "treefile": "fedora-ostree-workstation.json",
             "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f25",
             "source_repo_from": "Workstation",
-            "ostree_repo": "/mnt/koji/compose/ostree/rawhide/"
+            "ostree_repo": "/mnt/koji/compose/ostree/25/",
+            'failable': ['*'],
         }
     })
 ]
@@ -574,45 +602,47 @@ ostree_installer = [
         "x86_64": {
             "source_repo_from": "Everything",
             "release": None,
-            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso",
             "installpkgs": ["fedora-productimg-atomic"],
             "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
             "add_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/25/",
                 "ostree_osname=fedora-atomic",
-                "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
+                "ostree_install_ref=fedora-atomic/25/x86_64/updates/docker-host",
+                "ostree_update_ref=fedora-atomic/25/x86_64/docker-host",
             ],
             "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
             "add_arch_template_var": [
-                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
+                "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/25/",
                 "ostree_osname=fedora-atomic",
-                "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
-            ]
+                "ostree_install_ref=fedora-atomic/25/x86_64/updates/docker-host",
+                "ostree_update_ref=fedora-atomic/25/x86_64/docker-host",
+            ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f25',
+            'failable': ['*'],
         }
     }),
     ("^Workstation$", {
         "x86_64": {
             "source_repo_from": "Everything",
             "release": None,
-            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso",
-            "installpkgs": ["fedora-productimg-atomic"],
+            "installpkgs": ["fedora-productimg-workstation"],
             "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
             "add_template_var": [
-                "ostree_osname=fedora-atomic",
-                "ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/25/x86_64/workstation",
             ],
             "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
             "add_arch_template_var": [
-                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/25/",
                 "ostree_osname=fedora-workstation",
-                "ostree_ref=fedora/rawhide/x86_64/workstation",
-            ]
+                "ostree_ref=fedora/25/x86_64/workstation",
+            ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f25',
+            'failable': ['*'],
         }
     })
 ]
 
-release_id_allow_missing = True
-koji_profile = 'koji'
+koji_profile = 'compose_koji'

nightly.sh

@@ -1,28 +1,29 @@
 #!/bin/sh
 
+#set -x
 
 export LC_ALL=C
 
 CONFIG="fedora.conf"
-TARGET_DIR="/mnt/koji/compose/rawhide"
+TARGET_DIR="/mnt/koji/compose/branched"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY="--nightly"
 SKIP_PHASES="--skip-phase=productimg"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
-DIST="rawhide"
-BRANCHED="rawhide"
-BRANCH="rawhide"
-COMPSFILE="comps-rawhide.xml"
-GIT_BRANCH="master"
+DIST="25"
+BRANCHED="25"
+BRANCH="branched"
+COMPSFILE="comps-f25.xml"
+GIT_BRANCH="f25"
 TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
-FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
+FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
 RSYNCPREFIX="sudo -u ftpsync"
 ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
 ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
 ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"
-OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID)
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-25/COMPOSE_ID)
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
 
@@ -68,7 +69,7 @@ if [ "$?" = "0" ]; then
    export mail=0
 fi
 
-NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID)
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-25/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
 fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
 fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
@@ -77,7 +78,7 @@ fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compos
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
 
 compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
-/usr/share/mash/spam-o-matic $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck
+/usr/share/mash/spam-o-matic --treename F-$BRANCHED $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck
 
 [ -z "$ARCH" ] && {
 ./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
@@ -127,7 +128,7 @@ do
   elif [ "$koji" = "ppc" ]; then
      arches=ppc64,ppc64le
   elif [ "$koji" = "s390" ]; then
-     arches=s390,s390x
+     arches=s390x
   fi
   ./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/SRPMS/\*/ >$DESTDIR/logs/excludearch-$koji.log
 done

release-candidate.sh

@@ -0,0 +1,39 @@
+#!/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-final.conf"
+TARGET_DIR="/mnt/koji/compose/25"
+#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-f25.xml"
+TMPDIR=`mktemp -d /tmp/fedoraRC.$DATE.XXXX`
+# uncomment and edit for resuming a failed compose
+#COMPOSE_ID="Fedora-23-20150530.n.0"
+
+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 --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 "$@"

twoweek-nightly.sh

@@ -0,0 +1,110 @@
+#!/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-atomic.conf"
+TARGET_DIR="/mnt/koji/compose/twoweek"
+#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
+NIGHTLY=""
+SKIP_PHASES="--skip-phase=productimg --skip-phase=extra_files"
+DEST=$(pwd)
+DATE=$(date "+%Y%m%d")
+DIST="25"
+BRANCHED="25"
+BRANCH="branched"
+COMPSFILE="comps-f25.xml"
+GIT_BRANCH="f25"
+TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
+TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
+FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
+RSYNCPREFIX="sudo -u ftpsync"
+ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
+ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
+ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Atomic-25/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"}' "$BRANCHED" "$ARCH")
+fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
+FEDMSG_MODNAME="compose"
+FEDMSG_CERTPREFIX="releng"
+. ./releng/scripts/fedmsg-functions.sh
+
+# Announce that we are starting...
+send_fedmsg "${fedmsg_json_start}" ${DIST} start
+
+
+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 --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 "$@"
+if [ "$?" = "0" ]; then
+   export mail=0
+fi
+
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Atomic-25/COMPOSE_ID)
+SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
+
+
+DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
+$RSYNCPREFIX mkdir -p $DESTDIR
+
+# Tell interested persons that the rsync is starting (zomg!)
+
+send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
+
+for dir in Atomic CloudImages Docker metadata ;
+  do
+    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
+    $RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/ --name $NEWCOMPOSE_ID
+  done
+
+
+# Tell interested persons that the rsync is done.
+
+send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
+
+# Tell everyone by fedmsg about the compose
+
+send_fedmsg "${fedmsg_json_done}" ${DIST} complete
+
+SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
+#if [ "$mail" = "0" ]; then
+#    for tomail in $TOMAIL ; do
+#        cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
+#             mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+#    done
+#fi
+
+

variants-fedora.xml

@@ -32,7 +32,6 @@
             <arch>aarch64</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
-            <arch>s390</arch>
             <arch>s390x</arch>
         </arches>
     </variant>
@@ -55,7 +54,6 @@
             <arch>aarch64</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
-            <arch>s390</arch>
             <arch>s390x</arch>
         </arches>
         <groups>
@@ -116,6 +114,7 @@
             <group default="true">multimedia</group>
             <group default="true">networkmanager-submodules</group>
             <group default="true">printing</group>
+            <group default="true">workstation-ostree-support</group>
             <group default="true">workstation-product</group>
             <group default="true">arm-tools</group>
             <!-- Things needed for installation -->