Move output from nightly container/cloud compose to dedicated directory, cleanup older than 14 days

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>

cloud-nightly.sh

@@ -2,26 +2,26 @@
 #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/"
+TARGET_DIR="/mnt/koji/compose/cloud"
 #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="26"
-BRANCHED="26"
-BRANCH="branched"
+# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
+SHORT="Fedora-Cloud"
+RELEASE="26"
+RELEASE_TITLE="26"
 COMPSFILE="comps-f26.xml"
-GIT_BRANCH="f26"
-TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
+TMPDIR=`mktemp -d /tmp/$RELEASE.$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-26/COMPOSE_ID)
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
 # assume a releng dir is a git checkout of the releng repo
@@ -34,13 +34,12 @@ 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_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
 FEDMSG_MODNAME="compose"
 FEDMSG_CERTPREFIX="releng"
 . ./releng/scripts/fedmsg-functions.sh
 # Announce that we are starting, even though we don't know the compose_id yet..
-send_fedmsg "${fedmsg_json_start}" ${DIST} start
+send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
 pushd $TMPDIR
 git clone https://pagure.io/fedora-comps.git && {
     pushd fedora-comps
@@ -56,29 +55,37 @@ else
     CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
 fi
 time $CMD "$@"
-if [ "$?" = "0" ]; then
-   export mail=0
+if [ "$?" != "0" ]; then
+    exit 1
 fi
-NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)
+
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
+
 # Set this to use later for a few items include depcheck
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
+# Public URL the compose will wind up at, we put it in fedmsgs
+LOCATION=$(echo $DESTDIR|sed -e 's,/mnt/koji,https://kojipkgs.fedoraproject.org,g')
+# Update fedmsg template
+fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
+fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
+
 $RSYNCPREFIX mkdir -p $DESTDIR
 # Tell interested persons that the rsync is starting (zomg!)
-send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
+#send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
 #for dir in CloudImage metadata ;
 #  do
-#    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
+#    $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
 #  done
 # Tell interested persons that the rsync is done.
-#send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
+#send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
 # Tell everyone by fedmsg about the compose
-send_fedmsg "${fedmsg_json_done}" ${DIST} complete
+send_fedmsg "${fedmsg_json_done}" ${RELEASE} 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
+SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
+#for tomail in $TOMAIL ; do
+#    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
+#         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+#done
+
+find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

docker-nightly.sh

@@ -1,26 +1,26 @@
 #!/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/"
+TARGET_DIR="/mnt/koji/compose/container"
 #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="26"
-BRANCHED="26"
-BRANCH="branched"
+# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
+SHORT="Fedora-Docker"
+RELEASE="26"
+RELEASE_TITLE="26"
 COMPSFILE="comps-f26.xml"
-GIT_BRANCH="f26"
-TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
+TMPDIR=`mktemp -d /tmp/$RELEASE.$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-26/COMPOSE_ID)
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
 # assume a releng dir is a git checkout of teh releng repo
@@ -33,13 +33,12 @@ 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_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
 FEDMSG_MODNAME="compose"
 FEDMSG_CERTPREFIX="releng"
 . ./releng/scripts/fedmsg-functions.sh
 # Announce that we are starting...
-send_fedmsg "${fedmsg_json_start}" ${DIST} start
+send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
 pushd $TMPDIR
 git clone https://pagure.io/fedora-comps.git && {
     pushd fedora-comps
@@ -55,27 +54,36 @@ else
     CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
 fi
 time $CMD "$@"
-if [ "$?" = "0" ]; then
-   export mail=0
+if [ "$?" != "0" ]; then
+    exit 1
 fi
-NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-26/COMPOSE_ID)
+
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
+
+# Set this to use later for a few items include depcheck
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
+# Public URL the compose will wind up at, we put it in fedmsgs
+LOCATION=$(echo $DESTDIR|sed -e 's,/mnt/koji,https://kojipkgs.fedoraproject.org,g')
+# Update fedmsg template
+fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
+fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
+
 $RSYNCPREFIX mkdir -p $DESTDIR
 # Tell interested persons that the rsync is starting (zomg!)
-send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
+#send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
 #for dir in Docker metadata ;
 #  do
-#    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
+#    $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
 #  done
 # Tell interested persons that the rsync is done.
-#send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
+#send_fedmsg "${fedmsg_json_done}" ${RELEASE} 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
+send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
+SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
+#for tomail in $TOMAIL ; do
+#    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
+#         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+#done
+
+find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

fedora-alpha.conf

@@ -0,0 +1,648 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '26'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f26.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 = ['64DAB85D']
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 'x86_64']
+
+# 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 = 'compose'
+runroot_tag = 'f26-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f26-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'],
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-1.8.0-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# 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', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers'
+    ],
+}
+
+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/f26'
+global_release = "1.7"
+global_version = '26_Alpha'
+# live_images ignores this in favor of live_target
+global_target = 'f26'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Docker_Base'
+                    'failable': ['*'],
+                    },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-docker-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base'
+                    'failable': ['*'],
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['aarch64', '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',
+                    'failable': ['*'],
+                     }
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom'
+                    'failable': ['*'],
+                     }
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                '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'
+            },
+            {
+                'name': 'Fedora-LXQt-Live',
+                'kickstart': 'fedora-live-lxqt.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXQt'
+            }
+        ],
+    '^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'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f26'
+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': True,
+                },
+                {
+                '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,
+                },
+                {
+                'kickstart': 'fedora-arm-lxqt.ks',
+                'name': 'Fedora-LXQt-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXQt',
+                'failable': True,
+                },]
+    }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
+]
+
+ostree = [
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f26",
+            "source_repo_from": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/26/",
+            '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/26/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/26/",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/26/x86_64/workstation",
+            ]
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f26',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'

fedora-atomic.conf

@@ -23,7 +23,7 @@ comps_file = 'comps-f26.xml' #{
 #    'file': 'comps-f23.xml',
 #}
 variants_file='variants-fedora.xml'
-sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+sigkeys = ['64DAB85D'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
 tree_arches = ['x86_64']
@@ -185,6 +185,7 @@ image_volid_formats = [
 image_volid_layered_product_formats = []
 # Replace 'Cloud' with 'C' in volume id etc.
 volume_id_substitutions = {
+         'Atomic': 'AH',
         'Rawhide': 'rawh',
          'Images': 'img',
     'MATE_Compiz': 'MATE',
@@ -225,10 +226,6 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 6,
                     'arches': ['x86_64'],
-                    'repo_from': 'Cloud',
-                    'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
-                    ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic'
                      }
@@ -245,37 +242,32 @@ image_build = {
                     'distro': 'Fedora-20',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'repo_from': 'Cloud',
-                    'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
-                    ],
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Atomic'
-                     }
+                     },
+            'factory-parameters': {
+                    'vagrant_sync_directory': '/home/vagrant/sync',
+            }
         }
         ],
 }
 ostree_installer = [
     ("^Atomic$", {
         "x86_64": {
-            "source_repo_from": [ "Cloud",
-                                  "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],
+            "repo": [ "Cloud",
+                      "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],
             "release": None,
             "installpkgs": ["fedora-productimg-atomic"],
-            "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
+            "rootfs_size": "3",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl"],
             "add_template_var": [
-                "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/26/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/atomic/26/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/26/",
                 "ostree_osname=fedora-atomic",
                 "ostree_install_ref=fedora/26/x86_64/updates/atomic-host",
                 "ostree_update_ref=fedora/26/x86_64/atomic-host",
             ],
-            "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
-            "add_arch_template_var": [
-                "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/26/",
-                "ostree_osname=fedora-atomic",
-                "ostree_install_ref=fedora/26/x86_64/updates/atomic-host",
-                "ostree_update_ref=fedora/26/x86_64/atomic-host",
-            ]
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'f26',
         }

fedora-beta.conf

@@ -0,0 +1,749 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '26'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f26.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 = ['64DAB85D']
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 'x86_64']
+
+# 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 = 'compose'
+runroot_tag = 'f26-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f26-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'],
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-1.8.0-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# 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', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers'
+    ],
+}
+
+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/f26'
+global_release = '1.4'
+global_version = '26_Beta'
+# live_images ignores this in favor of live_target
+global_target = 'f26'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Docker_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-docker-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora-minimal',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['aarch64'],
+                     }
+        },
+        {
+            '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',
+                    'failable': ['*'],
+                     },
+        },
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Atomic',
+                    'kickstart': 'fedora-atomic.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 6,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Atomic-Vagrant',
+                    'kickstart': 'fedora-atomic-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'vagrant_sync_directory': '/home/vagrant/sync',
+            }
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Spins': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Minimal',
+                    'kickstart': 'fedora-disk-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['aarch64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Minimal',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Workstation$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Workstation',
+                    'kickstart': 'fedora-disk-workstation.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 8,
+                    'arches': ['aarch64'],
+                    'repo_from': 'Workstation',
+                    'install_tree_from': 'Workstation',
+                    'subvariant': 'Workstation',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Server$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Server',
+                    'kickstart': 'fedora-disk-server.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 7,
+                    'arches': ['aarch64'],
+                    'repo_from': 'Server',
+                    'install_tree_from': 'Server',
+                    'subvariant': 'Server',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['i386'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['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'
+            },
+            {
+                'name': 'Fedora-LXQt-Live',
+                'kickstart': 'fedora-live-lxqt.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXQt'
+            }
+        ],
+    '^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'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # buildinstall makes no sense as blocking
+        'src': ['buildinstall'],
+        # Nothing on aarch64, i386, ppc64 and ppc64le blocks the compose
+        'aarch64': ['buildinstall', 'iso'],
+        'i386': ['buildinstall', 'iso'],
+        'ppc64': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f26'
+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': False,
+                },
+                {
+                'kickstart': 'fedora-arm-lxqt.ks',
+                'name': 'Fedora-LXQt-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXQt',
+                'failable': True,
+                },]
+    }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
+]
+
+ostree = [
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f26",
+            "source_repo_from": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/26/",
+            '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/26/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/26/",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/26/x86_64/workstation",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f26',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'

fedora-cloud.conf

@@ -1,21 +1,10 @@
 # PRODUCT INFO
-release_name = 'Fedora-Atomic'
-release_short = 'Fedora-Atomic'
+release_name = 'Fedora-Cloud'
+release_short = 'Fedora-Cloud'
 release_version = '26'
 release_is_layered = False
 # GENERAL SETTINGS
-bootable = True
-buildinstall_method = 'lorax'
-lorax_options = [
-  ('^.*$', {
-     'x86_64': {
-         'nomacboot': True
-     }
-     '*': {
-         'noupgrade': True
-     }
-  })
-]
+bootable = False 
 comps_file = 'comps-f26.xml' #{
 #    'scm': 'git',
 #    'repo': 'git://git.fedorahosted.org/git/comps.git',
@@ -23,13 +12,13 @@ comps_file = 'comps-f26.xml' #{
 #    'file': 'comps-f23.xml',
 #}
 variants_file='variants-fedora.xml'
-sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+sigkeys = ['64DAB85D'] # 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']
+tree_variants = ['CloudImages']
 hashed_directories = True
 # RUNROOT settings
 runroot = True
@@ -38,7 +27,7 @@ runroot_channel = 'compose'
 runroot_tag = 'f26-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f26-atomic'
+pkgset_koji_tag = 'f26-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@@ -216,69 +205,45 @@ image_build = {
         {
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
-                    'name': 'Fedora-Atomic',
+                    'name': 'Fedora-Cloud-Base',
                     'target': 'f26',
                     'version': '26',
                     'release': None,
                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
-                    'kickstart': 'fedora-atomic.ks',
+                    'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-20',
-                    'disk_size': 6,
-                    'arches': ['x86_64'],
-                    'repo_from': 'Cloud',
+                    'disk_size': 4,
+                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
                     'repo': [
                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
+                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
                     ],
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['aarch64', 'ppc64', 'ppc64le'],
                      }
         },
         {
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
-                    'name': 'Fedora-Atomic-Vagrant',
+                    'name': 'Fedora-Cloud-Base-Vagrant',
                     'target': 'f26',
                     'version': '26',
                     'release': None,
                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
-                    'kickstart': 'fedora-atomic-vagrant.ks',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
                     'distro': 'Fedora-20',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'repo_from': 'Cloud',
                     'repo': [
                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
+                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/'
                     ],
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
                      }
         }
         ],
 }
-ostree_installer = [
-    ("^Atomic$", {
-        "x86_64": {
-            "source_repo_from": [ "Cloud",
-                                  "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/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/26/",
-                "ostree_osname=fedora-atomic",
-                "ostree_install_ref=fedora/26/x86_64/updates/atomic-host",
-                "ostree_update_ref=fedora/26/x86_64/atomic-host",
-            ],
-            "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
-            "add_arch_template_var": [
-                "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/26/",
-                "ostree_osname=fedora-atomic",
-                "ostree_install_ref=fedora/26/x86_64/updates/atomic-host",
-                "ostree_update_ref=fedora/26/x86_64/atomic-host",
-            ]
-            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'f26',
-        }
-    })
-]
 koji_profile = 'compose_koji'

fedora-docker.conf

@@ -15,7 +15,7 @@ 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']
+tree_arches = ['aarch64', 'armhfp', 'ppc64le', 'x86_64']
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
 tree_variants = ['Docker']
@@ -27,7 +27,7 @@ runroot_channel = 'compose'
 runroot_tag = 'f26-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f25-updates'
+pkgset_koji_tag = 'f26-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@@ -174,6 +174,7 @@ image_volid_formats = [
 image_volid_layered_product_formats = []
 # Replace 'Cloud' with 'C' in volume id etc.
 volume_id_substitutions = {
+         'Atomic': 'AH',
         'Rawhide': 'rawh',
          'Images': 'img',
     'MATE_Compiz': 'MATE',
@@ -200,28 +201,63 @@ disc_types = {
 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/f26'
+global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
+global_version = '26'
+global_target = 'f26'
+
 image_build = {
     '^Docker$': [
         {
             'image-build': {
-                    'format': [('docker', 'tar.xz')]
+                    'format': [('docker', 'tar.xz')],
                     'name': 'Fedora-Docker-Base',
-                    'target': 'f26',
-                    'version': '26',
-                    'release': None,
-                    # correct SHA1 hash will be put into the URL below automatically
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
                     'kickstart': 'fedora-docker-base.ks',
-                    'distro': 'Fedora-20',
-                    'disk_size': 3,
-                    'arches': ['x86_64', 'armhfp'],
+                    'distro': 'Fedora-26',
+                    'disk_size': 5,
+                    'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
+                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/compose/26/Fedora-26-20170705.0/compose/Everything/$arch/os/',
                     'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
-                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f26-updates/compose/Everything/$arch/os/',
+                        'https://kojipkgs.fedoraproject.org/compose/26/Fedora-26-20170705.0/compose/Everything/$arch/os/',
                     ],
-                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
                     'subvariant': 'Docker_Base'
-                    }
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
+            },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-docker-base-minimal.ks',
+                    'distro': 'Fedora-26',
+                    'disk_size': 5,
+                    'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
+                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/compose/26/Fedora-26-20170705.0/compose/Everything/$arch/os/',
+                    'repo': [
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f26-updates/compose/Everything/$arch/os/',
+                        'https://kojipkgs.fedoraproject.org/compose/26/Fedora-26-20170705.0/compose/Everything/$arch/os/',
+                    ],
+                    'subvariant': 'Container_Minimal_Base',
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora-minimal',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
         }
         ],
 }

fedora-final.conf

@@ -0,0 +1,748 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '26'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f26.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 = ['64DAB85D']
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 'x86_64']
+
+# 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 = 'compose'
+runroot_tag = 'f26-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f26-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 = False
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.5-%(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'],
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-1.8.0-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# 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', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust'
+    ],
+}
+
+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.5.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/f26'
+global_release = "1.5"
+global_version = '26'
+# live_images ignores this in favor of live_target
+global_target = 'f26'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Docker_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-docker-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora-minimal',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
+                    'repo': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['aarch64', 'ppc64', 'ppc64le'],
+                     }
+        },
+        {
+            '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': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+                     },
+        },
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Atomic',
+                    'kickstart': 'fedora-atomic.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 6,
+                    'arches': ['x86_64'],
+                    'repo': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Atomic-Vagrant',
+                    'kickstart': 'fedora-atomic-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'vagrant_sync_directory': '/home/vagrant/sync',
+            }
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Spins': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Minimal',
+                    'kickstart': 'fedora-disk-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['aarch64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Minimal',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Workstation$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Workstation',
+                    'kickstart': 'fedora-disk-workstation.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 8,
+                    'arches': ['aarch64'],
+                    'repo': 'Workstation',
+                    'install_tree_from': 'Workstation',
+                    'subvariant': 'Workstation',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Server$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Server',
+                    'kickstart': 'fedora-disk-server.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 7,
+                    'arches': ['aarch64'],
+                    'repo': 'Server',
+                    'install_tree_from': 'Server',
+                    'subvariant': 'Server',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['i386'],
+                'repo': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['i386'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            },
+            {
+                'name': 'Fedora-LXQt-Live',
+                'kickstart': 'fedora-live-lxqt.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXQt'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': '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': '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': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # buildinstall makes no sense as blocking
+        'src': ['buildinstall'],
+        # Nothing on aarch64, i386, ppc64 and ppc64le blocks the compose
+        'aarch64': ['buildinstall', 'iso'],
+        'i386': ['buildinstall', 'iso'],
+        'ppc64': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f26'
+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': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': False,
+                },
+                {
+                'kickstart': 'fedora-arm-lxqt.ks',
+                'name': 'Fedora-LXQt-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXQt',
+                'failable': True,
+                },]
+    }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
+]
+
+ostree = [
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f26",
+            "repo": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/26/",
+            'failable': ['*'],
+        }
+    })
+]
+
+ostree_installer = [
+    ("^Workstation$", {
+        "x86_64": {
+            "repo": "Everything",
+            "release": None,
+            "installpkgs": ["fedora-productimg-workstation"],
+            "rootfs_size": "8",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl"],
+            "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/26/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/compose/ostree/26/",
+                "ostree_osname=fedora-workstation",
+                "ostree_install_ref=fedora/26/x86_64/workstation",
+                "ostree_update_ref=fedora/26/x86_64/workstation",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f26',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'

fedora-modular-final.conf

@@ -0,0 +1,198 @@
+# PRODUCT INFO
+release_name = 'Fedora-Modular'
+release_short = 'Fedora-Modular'
+release_version = '26'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+
+variants_file='variants-modular.xml'
+sigkeys = ['a3cc4e62']
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+runroot_channel = 'compose'
+runroot_tag = 'f26-modularity'
+
+# PDC settings
+pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
+pdc_insecure = False
+pdc_develop = True
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - KOJI
+# pkgset_koji_tag is not used by the modular compose, but Pungi needs this
+# option to appear in a config, otherwise it fails. Once this is fixed, we can
+# remove this option completely.
+pkgset_koji_tag = 'not-used'
+pkgset_koji_inherit = False
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'module'
+gather_method = 'nodeps'
+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.10-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# OK, we have the anaconda module now.  Let's try buildinstall, but still skip
+# the phases which depend on it.
+skip_phases= ["live_media", "live_images", "ostree"]
+
+# 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
+     }
+  })
+]
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+
+]
+
+filter_packages = [
+
+]
+
+createiso_skip = [
+        ('^base-runtime$', {
+            '*': True,
+            'src': True
+        }),
+        ('^Server$', {
+            '*': True,
+            'src': True
+        }),
+    ]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.10.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',
+}
+
+# https://pagure.io/fedora-kickstarts/pull-request/257
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26'
+global_release = "1.10"
+global_version = '26'
+global_target = 'module-bootstrap-f26'
+
+image_build = {
+    '^Server$': [
+        {
+            'image-build': {
+                'format': [('docker', 'tar.xz')],
+                'name': 'Fedora-Modular-Docker-Base',
+                # https://pagure.io/fedora-kickstarts/pull-request/257
+                'kickstart': 'fedora-modular-docker-base-minimal.ks',
+                'distro': 'Fedora-26',
+                'disk_size': 4,
+                'arches': ['x86_64'],
+                'install_tree_from': 'Server',
+                'subvariant': 'Docker_Base',
+            },
+            'factory-parameters': {
+                'dockerversion': '1.10.1',
+                'docker_cmd': '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container_modular", "FGC=f26-modular" ]',
+                'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26-modular"}',
+            },
+        },
+        {
+            'image-build': {
+                'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                'name': 'Fedora-Modular-Server',
+                'kickstart': 'fedora-modular-disk-minimal.ks',
+                'distro': 'Fedora-26',
+                'disk_size': 8,
+                'arches': ['x86_64'],
+                'repo': 'Server',
+                'install_tree_from': 'Server',
+                'subvariant': 'Server',
+                'failable': ['*'],
+             }
+        },
+    ],
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+
+
+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'],
+    })
+]
+
+
+koji_profile = 'compose_koji'

fedora-modular.conf

@@ -0,0 +1,180 @@
+# PRODUCT INFO
+release_name = 'Fedora-Modular'
+release_short = 'Fedora-Modular'
+release_version = '26'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+
+variants_file='variants-modular.xml'
+sigkeys = ['a3cc4e62']
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+runroot_channel = 'compose'
+runroot_tag = 'f26-modularity'
+
+# PDC settings
+pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
+pdc_insecure = False
+pdc_develop = True
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f26'
+pkgset_koji_inherit = False
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'module'
+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-%(arch)s-%(date)s%(type_suffix)s.%(respin)s'
+#jigdo
+create_jigdo = False
+
+# OK, we have the anaconda module now.  Let's try buildinstall, but still skip
+# the phases which depend on it.
+skip_phases= ["live_media", "live_images", "ostree"]
+
+# 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
+     }
+  })
+]
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+
+]
+
+filter_packages = [
+    # TODO - autogenerate this from the modulemd someday.
+]
+
+createiso_skip = [
+        ('^base-runtime$', {
+            '*': True,
+            'src': True
+        }),
+        ('^Server$', {
+            '*': True,
+            'src': True
+        }),
+    ]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# 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 = {
+         'Atomic': 'AH',
+        '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',
+}
+
+# https://pagure.io/fedora-kickstarts/pull-request/257
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26'
+global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
+global_version = '26_Modular'
+global_target = 'f26-modularity'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                'format': [('docker', 'tar.xz')],
+                'name': 'Fedora-Modular-Docker-Base',
+                # https://pagure.io/fedora-kickstarts/pull-request/257
+                'kickstart': 'fedora-modular-docker-base-minimal.ks',
+                'distro': 'Fedora-26',
+                'disk_size': 4,
+                'arches': ['x86_64'],
+                'install_tree_from': 'Server',
+                'subvariant': 'Docker_Base',
+            },
+            'factory-parameters': {
+                'dockerversion': '1.10.1',
+                'docker_cmd': '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container_modular", "FGC=f26-modular" ]',
+                'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26-modular"}',
+            },
+        },
+    ],
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+
+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'],
+    })
+]
+
+koji_profile = 'compose_koji'

fedora.conf

@@ -1,12 +1,12 @@
 # PRODUCT INFO
 release_name = 'Fedora'
 release_short = 'Fedora'
-release_version = 'Rawhide'
+release_version = '26'
 release_is_layered = False
 
 # GENERAL SETTINGS
 bootable = True
-comps_file = 'comps-rawhide.xml' #{
+comps_file = 'comps-f26.xml' #{
 #    'scm': 'git',
 #    'repo': 'https://pagure.io/fedora-comps.git',
 #    'branch': None, # defaults to cvs/HEAD or git/master
@@ -79,7 +79,7 @@ lorax_options = [
   ('^.*$', {
      'x86_64': {
          'nomacboot': False
-     }
+     },
      '*': {
          'noupgrade': True
      }
@@ -181,7 +181,7 @@ multilib_whitelist = {
         'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
         'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
         'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
-        'fakechroot-libs','mesa-vdpau-drivers'
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust'
     ],
 }
 
@@ -264,9 +264,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/f26'
 global_release = None
-global_version = 'Rawhide'
+global_version = '26'
 # live_images ignores this in favor of live_target
 global_target = 'f26'
 
@@ -274,49 +274,65 @@ 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',
-                    'disk_size': 3,
-                    'arches': ['x86_64', 'armhfp'],
-                    'repo_from': 'Cloud',
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Docker_Base'
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Docker_Base',
                     'failable': ['*'],
                     },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
+                },
+            },
+        },
+        {
             'image-build': {
-                    'format': [('docker', 'tar.xz')]
+                    'format': [('docker', 'tar.xz')],
                     'name': 'Fedora-Container-Minimal-Base',
                     'kickstart': 'fedora-docker-base-minimal.ks',
                     'distro': 'Fedora-22',
-                    'disk_size': 3,
-                    'arches': ['x86_64', 'armhfp'],
-                    'repo_from': 'Cloud',
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Container_Minimal_Base'
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
                     'failable': ['*'],
-                    }
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
+                },
+            },
         }
         ],
     '^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',
                     'disk_size': 4,
-                    'arches': ['x86_64'],
+                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
                     'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
-                    'subvariant': 'Cloud_Base'
-                    'failable': ['*'],
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['aarch64', 'ppc64', 'ppc64le'],
                      }
         },
         {
             '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',
@@ -326,43 +342,105 @@ image_build = {
                     'install_tree_from': 'Cloud',
                     'subvariant': 'Cloud_Base',
                     'failable': ['*'],
-                     }
-            'factory-parameters': {
-                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
-            }
+                     },
         },
         {
             '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',
                     'disk_size': 6,
                     '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',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'repo_from': 'Cloud',
                     'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'subvariant': 'Atomic',
                     'failable': ['*'],
-                     }
+                     },
+            'factory-parameters': {
+                    'vagrant_sync_directory': '/home/vagrant/sync',
+            }
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     },
             'factory-parameters': {
                     'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
             }
         },
         ],
+    '^Spins': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Minimal',
+                    'kickstart': 'fedora-disk-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['aarch64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Minimal',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Workstation$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Workstation',
+                    'kickstart': 'fedora-disk-workstation.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 8,
+                    'arches': ['aarch64'],
+                    'repo_from': 'Workstation',
+                    'install_tree_from': 'Workstation',
+                    'subvariant': 'Workstation',
+                    'failable': ['*'],
+                     }
+        },
+        ],
+    '^Server$': [
+        {
+            'image-build': {
+                    'format': [('raw-xz','raw.xz')],
+                    'name': 'Fedora-Server',
+                    'kickstart': 'fedora-disk-server.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 7,
+                    'arches': ['aarch64'],
+                    'repo_from': 'Server',
+                    'install_tree_from': 'Server',
+                    'subvariant': 'Server',
+                    'failable': ['*'],
+                     }
+        },
+        ],
 }
 
 live_media = {
@@ -371,7 +449,7 @@ live_media = {
                 'name': 'Fedora-Workstation-Live',
                 'kickstart': 'fedora-live-workstation.ks',
                 'arches': ['x86_64', 'i386'],
-                'failable': ['*'],
+                'failable': ['i386'],
                 'repo_from': 'Everything',
                 'subvariant': 'Workstation'
 
@@ -382,7 +460,7 @@ live_media = {
                 'name': 'Fedora-KDE-Live',
                 'kickstart': 'fedora-live-kde.ks',
                 'arches': ['x86_64', 'i386'],
-                'failable': ['*'],
+                'failable': ['i386'],
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'KDE'
@@ -506,16 +584,28 @@ live_media = {
                 'repo_from': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'Robotics'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
             }
     ],
 }
 
 failable_deliverables = [
     ('^.*$', {
-        # Buildinstall can fail on any variant and any arch
+        # buildinstall makes no sense as blocking
         'src': ['buildinstall'],
-        # Nothing on i386 blocks the compose
+        # Nothing on aarch64, i386, ppc64 and ppc64le blocks the compose
+        'aarch64': ['buildinstall', 'iso'],
         'i386': ['buildinstall', 'iso'],
+        'ppc64': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
     })
 ]
 
@@ -570,7 +660,7 @@ live_images = [
                 'repo_from': 'Everything',
                 'type': 'appliance',
                 'subvariant': 'Minimal',
-                'failable': True,
+                'failable': False,
                 },
                 {
                 'kickstart': 'fedora-arm-soas.ks',
@@ -586,7 +676,7 @@ live_images = [
                 'repo_from': 'Everything',
                 'type': 'appliance',
                 'subvariant': 'Xfce',
-                'failable': True,
+                'failable': False,
                 },
                 {
                 'kickstart': 'fedora-arm-lxqt.ks',
@@ -597,6 +687,16 @@ live_images = [
                 'failable': True,
                 },]
     }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
 ]
 
 ostree = [
@@ -604,15 +704,17 @@ ostree = [
         "aarch64": {
             "treefile": "fedora-atomic-docker-host.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f26",
             "source_repo_from": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/atomic/26/",
             'failable': ['*'],
         },
         "x86_64": {
             "treefile": "fedora-atomic-docker-host.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f26",
             "source_repo_from": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/atomic/26/",
             'failable': ['*'],
         }
     }),
@@ -620,8 +722,9 @@ ostree = [
         "x86_64": {
             "treefile": "fedora-ostree-workstation.json",
             "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f26",
             "source_repo_from": "Workstation",
-            "ostree_repo": "/mnt/koji/compose/ostree/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/ostree/26/",
             'failable': ['*'],
         }
     })
@@ -632,20 +735,19 @@ ostree_installer = [
         "x86_64": {
             "source_repo_from": "Everything",
             "release": None,
+            "rootfs_size": "3",
             "installpkgs": ["fedora-productimg-atomic"],
-            "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl"],
             "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/26/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/26/",
                 "ostree_osname=fedora-atomic",
-                "ostree_ref=fedora/rawhide/x86_64/atomic-host",
+                "ostree_install_ref=fedora/26/x86_64/atomic-host",
+                "ostree_update_ref=fedora/26/x86_64/atomic-host",
             ],
-            "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
-            "add_arch_template_var": [
-                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
-                "ostree_osname=fedora-atomic",
-                "ostree_ref=fedora/rawhide/x86_64/atomic-host",
-            ]
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f26',
             'failable': ['*'],
         }
     }),
@@ -654,19 +756,18 @@ ostree_installer = [
             "source_repo_from": "Everything",
             "release": None,
             "installpkgs": ["fedora-productimg-workstation"],
-            "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
+            "rootfs_size": "8",
+            "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
+                             "ostree-based-installer/lorax-embed-repo.tmpl"],
             "add_template_var": [
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/26/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/compose/ostree/26/",
                 "ostree_osname=fedora-workstation",
-                "ostree_ref=fedora/rawhide/x86_64/workstation",
+                "ostree_install_ref=fedora/26/x86_64/workstation",
+                "ostree_update_ref=fedora/26/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_osname=fedora-workstation",
-                "ostree_ref=fedora/rawhide/x86_64/workstation",
-            ]
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f26',
             'failable': ['*'],
         }
     })

nightly-modular.sh

@@ -0,0 +1,68 @@
+#!/bin/sh
+
+
+export LC_ALL=C
+
+CONFIG="fedora-modular.conf"
+TARGET_DIR="/mnt/koji/compose"
+#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")
+SHORT="Fedora-Modular"
+RELEASE="26"
+RELEASE_TITLE="26"
+COMPSFILE="comps-f26.xml"
+TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
+TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
+FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
+RSYNCPREFIX="sudo -u ftpsync"
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
+
+# assume a releng dir is a git checkout of the releng repo
+# if it does not exist clone it
+if [ -d releng ]; then
+    pushd releng
+    git pull --rebase
+    popd
+else
+    git clone https://pagure.io/releng.git
+fi
+
+# Set up our fedmsg function, using the releng repo definition
+FEDMSG_MODNAME="compose"
+FEDMSG_CERTPREFIX="releng"
+. ./releng/scripts/fedmsg-functions.sh
+
+# Announce that we are starting, even though we don't know the compose_id yet..
+fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
+send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
+
+CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
+
+if [ -z "$COMPOSE_ID" ]; then
+    CMD="$CMD --target-dir=$TARGET_DIR"
+else
+    CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
+fi
+
+time $CMD "$@"
+if [ "$?" != "0" ]; then
+    exit 1
+fi
+
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
+SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||g')
+# Public URL the compose will wind up at, we put it in fedmsgs
+LOCATION=$(echo "$TARGET_DIR/$NEWCOMPOSE_ID"|sed -e 's,/mnt/koji,https://kojipkgs.fedoraproject.org,g')
+
+# Update fedmsg template
+fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
+fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
+
+# Tell everyone by fedmsg about the compose
+send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
+
+# Remove old composes older than 14 days
+find $TARGET_DIR/$SHORT-$RELEASE_TITLE*  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

nightly.sh

@@ -4,25 +4,25 @@
 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="26"
+BRANCHED="26"
+BRANCH="branched"
+COMPSFILE="comps-f26.xml"
+GIT_BRANCH="f26"
 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-26/COMPOSE_ID)
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
 
@@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then
     exit 1
 fi
 
-NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID)
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/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")
@@ -121,8 +121,8 @@ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch
     "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$DIST/ \
     --exclude=s390x \
     --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after
-$RSYNCPREFIX rm /pub/alt/development/$DIST/.composeinfo
-$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/development/$DIST/ --name "$NEWCOMPOSE_ID"
+$RSYNCPREFIX rm /pub/fedora-secondary/development/$DIST/.composeinfo
+$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora-secondary/development/$DIST/ --name "$NEWCOMPOSE_ID"
 
 $RSYNCPREFIX rsync -avhH --delete-after $ATOMICREPO $ATOMICDEST
 
@@ -146,9 +146,9 @@ 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/Packages/\*/ >$DESTDIR/logs/excludearch-$koji.log
+  ./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/Packages/ >$DESTDIR/logs/excludearch-$koji.log
 done
 
 find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

release-candidate-modular.sh

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

release-candidate.sh

@@ -1,6 +1,9 @@
 #!/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/26"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"

twoweek-nightly.sh

@@ -1,6 +1,9 @@
 #!/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"
@@ -8,19 +11,17 @@ NIGHTLY=""
 SKIP_PHASES="--skip-phase=productimg --skip-phase=extra_files"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
-DIST="26"
-BRANCHED="26"
-BRANCH="branched"
+# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
+SHORT="Fedora-Atomic"
+RELEASE="26"
+RELEASE_TITLE="26"
 COMPSFILE="comps-f26.xml"
-GIT_BRANCH="f26"
-TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
+TMPDIR=`mktemp -d /tmp/$RELEASE.$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-26/COMPOSE_ID)
+RSYNCTARGET="/pub/alt/atomic/testing/$SHORTCOMPOSE_ID"
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
 # assume a releng dir is a git checkout of teh releng repo
@@ -33,13 +34,12 @@ 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_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
 FEDMSG_MODNAME="compose"
 FEDMSG_CERTPREFIX="releng"
 . ./releng/scripts/fedmsg-functions.sh
 # Announce that we are starting...
-send_fedmsg "${fedmsg_json_start}" ${DIST} start
+send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
 pushd $TMPDIR
 git clone https://pagure.io/fedora-comps.git && {
     pushd fedora-comps
@@ -55,28 +55,34 @@ else
     CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
 fi
 time $CMD "$@"
-if [ "$?" = "0" ]; then
-   export mail=0
+if [ "$?" != "0" ]; then
+    exit 1
 fi
-NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Atomic-26/COMPOSE_ID)
+
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
+
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
+# Public URL the synced compose will wind up at, we put it in fedmsgs
+LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
+# Update fedmsg template
+fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
+fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
+
 $RSYNCPREFIX mkdir -p $DESTDIR
 # Tell interested persons that the rsync is starting (zomg!)
-send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
+send_fedmsg "${fedmsg_json_start}" ${RELEASE} 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
+    $RSYNCPREFIX rsync -avhH $DESTDIR/compose/$dir/ "$RSYNCTARGET/$dir/" ;
+    $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name $NEWCOMPOSE_ID
   done
 # Tell interested persons that the rsync is done.
-send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
+send_fedmsg "${fedmsg_json_done}" ${RELEASE} 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
+send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
+SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
+#for tomail in $TOMAIL ; do
+#    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
+#         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
+#done

variants-fedora.xml

@@ -38,6 +38,7 @@
     </variant>
     <variant id="Labs" name="Labs" type="variant" is_empty="true">
         <arches>
+            <arch>armhfp</arch>
             <arch>i386</arch>
             <arch>x86_64</arch>
         </arches>
@@ -92,6 +93,7 @@
     </variant>
     <variant id="Spins" name="Spins" type="variant" is_empty="true">
         <arches>
+            <arch>aarch64</arch>
             <arch>armhfp</arch>
             <arch>i386</arch>
             <arch>x86_64</arch>
@@ -161,6 +163,8 @@
             <!-- Things needed for installation -->
             <group default="true">anaconda-tools</group>
             <group default="true">platform-vmware</group>
+            <!-- Things needed for Atomic Host -->
+            <group default="true">ostree-support</group>
         </groups>
         <environments>
           <environment display_order="10">cloud-server-environment</environment>

variants-modular.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
+<variants>
+    <variant id="Server" name="Server" type="variant">
+        <arches>
+            <arch>aarch64</arch>
+            <arch>armhfp</arch>
+            <arch>i386</arch>
+            <arch>ppc64</arch>
+            <arch>ppc64le</arch>
+            <arch>x86_64</arch>
+        </arches>
+        <modules>
+                <module>base-runtime-f26</module>
+                <module>varnish-f26</module>
+                <module>haproxy-f26</module>
+                <module>httpd-f26</module>
+                <module>perl-f26</module>
+                <module>nginx-f26</module>
+                <module>container-runtime-f26</module>
+                <module>perl-Unicode-EastAsianWidth-f26</module>
+                <module>shim-master</module>
+                <module>dnf-f26</module>
+                <module>memcached-f26</module>
+                <module>dhcp-server-f26</module>
+                <module>shared-userspace-f26</module>
+                <module>mongodb-f26</module>
+                <module>mariadb-f26</module>
+                <module>nodejs-f26</module>
+                <module>source-to-image-f26</module>
+                <module>postgresql-f26</module>
+                <module>dhcp-f26</module>
+                <module>postfix-f26</module>
+                <module>sssd-f26</module>
+                <module>installer-f26</module>
+                <module>php-f26</module>
+                <module>systemtools-f26</module>
+                <module>nodejs-8</module>
+        </modules>
+    </variant>
+</variants>