Removing ppc64 from F28 Cloud

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

cloud-nightly.sh

@@ -6,17 +6,16 @@ LABEL=$1
 # 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")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-Cloud"
-RELEASE="27"
-RELEASE_TITLE="27"
-COMPSFILE="comps-f27.xml"
+RELEASE="28"
+RELEASE_TITLE="28"
+COMPSFILE="comps-f28.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
 FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
@@ -40,15 +39,7 @@ FEDMSG_CERTPREFIX="releng"
 . ./releng/scripts/fedmsg-functions.sh
 # Announce that we are starting, even though we don't know the compose_id yet..
 send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
-pushd $TMPDIR
-git clone https://pagure.io/fedora-comps.git && {
-    pushd fedora-comps
-    make "${COMPSFILE}"
-    cp "${COMPSFILE}" $DEST/
-    popd
-}
-popd
-CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
+CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"
 if [ -z "$COMPOSE_ID" ]; then
     CMD="$CMD --target-dir=$TARGET_DIR"
 else
@@ -87,3 +78,5 @@ SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
 #    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
 #         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
 #done
+
+find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

container-nightly.sh

@@ -4,18 +4,17 @@ 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"
+CONFIG="fedora-container.conf"
+TARGET_DIR="/mnt/koji/compose/container"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY=""
-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")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-Docker"
-RELEASE="27"
-RELEASE_TITLE="27"
-COMPSFILE="comps-f27.xml"
+RELEASE="28"
+RELEASE_TITLE="28"
+COMPSFILE="comps-f28.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
 FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
@@ -39,15 +38,7 @@ FEDMSG_CERTPREFIX="releng"
 . ./releng/scripts/fedmsg-functions.sh
 # Announce that we are starting...
 send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
-pushd $TMPDIR
-git clone https://pagure.io/fedora-comps.git && {
-    pushd fedora-comps
-    make "${COMPSFILE}"
-    cp "${COMPSFILE}" $DEST/
-    popd
-}
-popd
-CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
+CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"
 if [ -z "$COMPOSE_ID" ]; then
     CMD="$CMD --target-dir=$TARGET_DIR"
 else
@@ -85,3 +76,5 @@ SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
 #    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-atomic.conf

@@ -1,46 +1,48 @@
 # PRODUCT INFO
 release_name = 'Fedora-Atomic'
 release_short = 'Fedora-Atomic'
-release_version = '26'
+release_version = '28'
 release_is_layered = False
+# Let's not build install media during this run. For the image builds
+# and OSTree installer we'll use inputs from other f28 runs.
+skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
+
 # GENERAL SETTINGS
 bootable = True
-buildinstall_method = 'lorax'
-lorax_options = [
-  ('^.*$', {
-     'x86_64': {
-         'nomacboot': True
-     }
-     '*': {
-         'noupgrade': True
-     }
-  })
-]
-comps_file = 'comps-f26.xml' #{
-#    'scm': 'git',
-#    'repo': 'git://git.fedorahosted.org/git/comps.git',
-#    'branch': None, # defaults to cvs/HEAD or git/master
-#    'file': 'comps-f23.xml',
-#}
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-f28.xml',
+    'command': 'make comps-f28.xml'
+}
 variants_file='variants-fedora.xml'
-sigkeys = ['64DAB85D'] # None = unsigned
+sigkeys = ['9DB62FB1']
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['x86_64']
+tree_arches = ['aarch64', 'ppc64le', 'x86_64']
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
-tree_variants = ['Atomic', 'Cloud', 'CloudImages']
+tree_variants = ['AtomicHost']
 hashed_directories = True
 # RUNROOT settings
 runroot = True
-#runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f26-build'
+runroot_tag = 'f28-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f26-atomic'
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+#pkgset_koji_tag = 'f28-atomic'
+pkgset_koji_tag = 'f28-atomic-host-installer'
 pkgset_koji_inherit = True
+
 filter_system_release_packages = False
+
 # GATHER
 gather_source = 'comps'
 gather_method = 'deps'
@@ -61,6 +63,28 @@ media_checksum_one_file = True
 media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'
 #jigdo
 create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+buildinstall_skip = [
+    ('^Modular$', {
+        '*': True
+    }),
+]
+
+# 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*',
 #]
@@ -126,21 +150,22 @@ filter_packages = [
 ]
 # format: {arch|*: [packages]}
 multilib_blacklist = {
-    '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*',
+    '*': ['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',
+        'php-devel', 'java-*',
         'httpd-devel', 'tomcat-native', 'php*', 'httpd',
         'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
     ],
 }
 # format: {arch|*: [packages]}
 multilib_whitelist = {
-    '*': ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper',
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
         'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
         'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
-        'syslinux-tftpboot', 'nosync', '*-static'
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
+        'mariadb-connector-odbc', 'compiler-rt'
     ],
 }
 createiso_skip = [
@@ -148,21 +173,25 @@ createiso_skip = [
             '*': True,
             'src': True
         }),
+
         ('^Server$', {
             'src': True
         }),
-        ('^Cloud$', {
-            '*': True,
-            'src': True
-        }),
+
         ('^Everything$', {
             '*': True,
             'src': True
         }),
+
+        ('^Modular$', {
+            '*': True,
+            'src': True
+        }),
     ]
+
 # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
 #extra_files = [
-#    ('^(Server|Workstation|Cloud)$', {
+#    ('^(Server|Workstation)$', {
 #        '*': [
 #            {
 #                'scm': 'rpm',
@@ -184,67 +213,78 @@ image_volid_formats = [
      ]
 # 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.
+# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
+# There is a hard 32-character limit on ISO volume IDs, so we use
+# these to try and produce short enough but legible IDs. Note this is
+# duplicated in Koji for live images, as livemedia-creator does not
+# allow Pungi to tell it what volume ID to use. Note:
+# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
+# '-Workstation-' is a temporary workaround. See
+# https://pagure.io/pungi-fedora/pull-request/525
 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',
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+           'AtomicHost': 'AH',
+    'AtomicWorkstation': 'AW',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
 }
+
 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/f28'
+global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
+global_version = '28'
+# live_images ignores this in favor of live_target
+global_target = 'f28'
 image_build = {
-    '^CloudImages$': [
+    '^AtomicHost$': [
         {
             'image-build': {
-                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
-                    'name': 'Fedora-Atomic',
-                    'target': 'f26',
-                    'version': '26',
-                    'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-AtomicHost',
                     'kickstart': 'fedora-atomic.ks',
-                    'distro': 'Fedora-20',
+                    'distro': 'Fedora-22',
                     'disk_size': 6,
-                    'arches': ['x86_64'],
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'arches': ['aarch64', 'ppc64le', 'x86_64'],
+                    'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
+                    'subvariant': 'AtomicHost',
                      }
         },
         {
             'image-build': {
-                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
-                    'name': 'Fedora-Atomic-Vagrant',
-                    'target': 'f26',
-                    'version': '26',
-                    'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-AtomicHost-Vagrant',
                     'kickstart': 'fedora-atomic-vagrant.ks',
-                    'distro': 'Fedora-20',
+                    'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
+                    'subvariant': 'AtomicHost',
                      },
             'factory-parameters': {
                     'vagrant_sync_directory': '/home/vagrant/sync',
@@ -252,25 +292,56 @@ image_build = {
         }
         ],
 }
+
 ostree_installer = [
-    ("^Atomic$", {
+    ("^AtomicHost$", {
         "x86_64": {
-            "repo": [ "Cloud",
-                      "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
             "release": None,
-            "installpkgs": ["fedora-productimg-atomic"],
             "rootfs_size": "4",
             "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/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-atomic",
-                "ostree_install_ref=fedora/rawhide/x86_64/atomic-host",
-                "ostree_update_ref=fedora/rawhide/x86_64/atomic-host",
+                "ostree_install_ref=fedora/28/x86_64/updates/atomic-host",
+                "ostree_update_ref=fedora/28/x86_64/atomic-host",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'f26',
+            'template_branch': 'f28',
+        },
+        "aarch64": {
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
+            "release": None,
+            "rootfs_size": "4",
+            "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/repo/",
+                "ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/",
+                "ostree_osname=fedora-atomic",
+                "ostree_install_ref=fedora/28/aarch64/updates/atomic-host",
+                "ostree_update_ref=fedora/28/aarch64/atomic-host",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f28',
+        },
+        "ppc64le": {
+            "repo": "https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/",
+            "release": None,
+            "rootfs_size": "4",
+            "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/repo/",
+                "ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/",
+                "ostree_osname=fedora-atomic",
+                "ostree_install_ref=fedora/28/ppc64le/updates/atomic-host",
+                "ostree_update_ref=fedora/28/ppc64le/atomic-host",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f28',
         }
     })
 ]

fedora-beta.conf

@@ -0,0 +1,849 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '28'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-f28.xml',
+    'command': 'make comps-f28.xml'
+}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['9DB62FB1']
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 's390x', '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 = 'f28-build'
+
+## PDC settings
+pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
+pdc_insecure = False
+# This option will skip getting an authentication token via Kerberos.
+pdc_develop = True
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f28-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_method = {
+    '^.*': {                # For all variants
+        'comps': 'deps',    # resolve dependencies for packages from comps file
+        'module': 'nodeps', # but not for packages from modules
+    }
+}
+gather_backend = 'dnf'
+gather_profiler = True
+check_deps = False
+greedy_method = 'build'
+
+repoclosure_backend = 'dnf'
+
+# 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_deltas = False
+
+# 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'
+buildinstall_skip = [
+    ('^Modular$', {
+        '*': True
+    }),
+]
+
+# 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 = [
+    ('^(Workstation|Server|Everything)$', {
+        '*': [
+            'kernel*',
+            'dracut*',
+            'autocorr-*',
+            'eclipse-nls',
+            'eclipse-nls-*',
+            'hunspell-*',
+            'hyphen-*',
+            'kde-l10n-*',
+            'libreoffice-langpack-*',
+            'man-pages-*',
+            'mythes-*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Workstation$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-1.8.0-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'php-devel', 'java-*',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
+        'mariadb-connector-odbc', 'compiler-rt'
+    ],
+}
+
+createiso_skip = [
+        ('^Workstation$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Modular$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server|Workstation)$', {
+#        '*': [
+#            {
+#                '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 = []
+# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
+# There is a hard 32-character limit on ISO volume IDs, so we use
+# these to try and produce short enough but legible IDs. Note this is
+# duplicated in Koji for live images, as livemedia-creator does not
+# allow Pungi to tell it what volume ID to use. Note:
+# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
+# '-Workstation-' is a temporary workaround. See
+# https://pagure.io/pungi-fedora/pull-request/525
+volume_id_substitutions = {
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+           'AtomicHost': 'AH',
+    'AtomicWorkstation': 'AW',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
+}
+
+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/f28'
+global_release = '1.3'
+global_version = '28_Beta'
+# live_images ignores this in favor of live_target
+global_target = 'f28'
+
+image_build = {
+    '^Container$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
+            },
+        },
+        {
+            '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', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
+            },
+        }
+        ],
+    '^Cloud$': [
+        {
+            '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', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['ppc64', 'ppc64le', 's390x'],
+                     }
+        },
+        {
+            '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': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+            },
+        },
+        ],
+    '^AtomicHost$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-AtomicHost',
+                    'kickstart': 'fedora-atomic.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 6,
+                    'arches': ['aarch64', 'ppc64le', 'x86_64'],
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'AtomicHost',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-AtomicHost-Vagrant',
+                    'kickstart': 'fedora-atomic-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'AtomicHost',
+                    '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','i386'],
+                    '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': 10,
+                    '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 = [
+    ('^Server$', { 
+        '*': ['buildinstall', 'iso'],
+    }),
+    ('^.*$', {
+        # Buildinstall is non blocking
+        'src': ['buildinstall'],
+        # Nothing on i386, ppc64, ppc64le blocks the compose
+        'i386': ['buildinstall', 'iso'],
+        'ppc64': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+        's390x': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f28'
+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 = [
+    ("^AtomicHost$", {
+        "aarch64": {
+            "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
+            "treefile": "fedora-atomic-host.json",
+            "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f28",
+            "repo": "Everything",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
+            'failable': ['*'],
+        },
+        "x86_64": {
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "treefile": "fedora-atomic-host.json",
+            "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f28",
+            "repo": "Everything",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
+            'failable': ['*'],
+        },
+        "ppc64le": {
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "treefile": "fedora-atomic-host.json",
+            "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f28",
+            "repo": "Everything",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
+            'failable': ['*'],
+        }
+    }),
+    ("^AtomicWorkstation$", {
+        "x86_64": {
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f28",
+            "repo": "Workstation",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
+            'failable': ['*'],
+        }
+    })
+]
+
+ostree_installer = [
+    ("^AtomicHost$", {
+        "x86_64": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "4",
+            "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/repo/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
+                "ostree_osname=fedora-atomic",
+                "ostree_install_ref=fedora/28/x86_64/atomic-host",
+                "ostree_update_ref=fedora/28/x86_64/atomic-host",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f28',
+            'failable': ['*'],
+        },
+        "aarch64": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "4",
+            "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/repo/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
+                "ostree_osname=fedora-atomic",
+                "ostree_install_ref=fedora/28/aarch64/atomic-host",
+                "ostree_update_ref=fedora/28/aarch64/atomic-host",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f28',
+            'failable': ['*'],
+        },
+        "ppc64le": {
+            "repo": "Everything",
+            "release": None,
+            "rootfs_size": "4",
+            "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/repo/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
+                "ostree_osname=fedora-atomic",
+                "ostree_install_ref=fedora/28/ppc64le/atomic-host",
+                "ostree_update_ref=fedora/28/ppc64le/atomic-host",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f28',
+            'failable': ['*'],
+        }
+    }),
+    ("^AtomicWorkstation$", {
+        "x86_64": {
+            "repo": "Everything",
+            "release": None,
+            "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/atomic/repo/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
+                "ostree_osname=fedora-workstation",
+                "ostree_install_ref=fedora/28/x86_64/workstation",
+                "ostree_update_ref=fedora/28/x86_64/workstation",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f28',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'

fedora-cloud.conf

@@ -1,33 +1,35 @@
 # PRODUCT INFO
 release_name = 'Fedora-Cloud'
 release_short = 'Fedora-Cloud'
-release_version = '26'
+release_version = '28'
 release_is_layered = False
+skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
 bootable = False 
-comps_file = 'comps-f26.xml' #{
-#    'scm': 'git',
-#    'repo': 'git://git.fedorahosted.org/git/comps.git',
-#    'branch': None, # defaults to cvs/HEAD or git/master
-#    'file': 'comps-f23.xml',
-#}
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-f28.xml',
+    'command': 'make comps-f28.xml'
+}
 variants_file='variants-fedora.xml'
-sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+sigkeys = ['9DB62FB1'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['x86_64']
+tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
-tree_variants = ['CloudImages']
+tree_variants = ['Cloud']
 hashed_directories = True
 # RUNROOT settings
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f26-build'
+runroot_tag = 'f28-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f26-updates'
+pkgset_koji_tag = 'f28-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@@ -88,50 +90,51 @@ additional_packages = [
         ],
     }),
 ]
+
 multilib = [
     ('^Everything$', {
         'x86_64': ['devel', 'runtime'],
-         's390x': ['devel', 'runtime']
     })
 ]
 filter_packages = [
-    ('(Workstation|Server|Cloud)$', {
+    ('(Workstation|Server)$', {
         '*': [
-        '^kernel.*debug.*',
-        '^kernel-kdump.*',
-        '^kernel-tools.*',
-        '^syslog-ng.*',
-        '^astronomy-bookmarks',
-        '^generic.*',
-        '^GConf2-dbus.*',
-        '^bluez-gnome',
-        #Periods cause problems in paterns, so replace with *s
-        '^java-1.8.0-openjdk',
-        '^community-mysql.*',
-        '^jruby.*',
-        '^gimp-help-.*',
+        '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*',
+    '*': ['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',
+        'php-devel', 'java-*',
         'httpd-devel', 'tomcat-native', 'php*', 'httpd',
         'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
     ],
 }
 # format: {arch|*: [packages]}
 multilib_whitelist = {
-    '*': ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper',
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
         'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
         'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
-        'syslinux-tftpboot', 'nosync', '*-static'
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
+        'mariadb-connector-odbc', 'compiler-rt'
     ],
 }
+
 createiso_skip = [
         ('^Workstation$', {
             '*': True,
@@ -175,24 +178,28 @@ image_volid_formats = [
 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',
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+           'AtomicHost': 'AH',
+    'AtomicWorkstation': 'AW',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
 }
 disc_types = {
     'boot': 'netinst',
@@ -202,44 +209,44 @@ translate_paths = [
    ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
 ]
 image_build = {
-    '^CloudImages$': [
+    '^Cloud$': [
         {
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                     'name': 'Fedora-Cloud-Base',
-                    'target': 'f26',
-                    'version': '26',
+                    'target': 'f28',
+                    'version': '28',
                     'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f28',
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 4,
-                    'arches': ['x86_64'],
+                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
-                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f28-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/' 
                     ],
-                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
-                    'subvariant': 'Cloud_Base'
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/',
+                    'subvariant': 'Cloud_Base',
                      }
         },
         {
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
                     'name': 'Fedora-Cloud-Base-Vagrant',
-                    'target': 'f26',
-                    'version': '26',
+                    'target': 'f28',
+                    'version': '28',
                     'release': None,
-                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
+                    'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f28',
                     'kickstart': 'fedora-cloud-base-vagrant.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
                     'repo': [
-                        'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
-                        'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f28-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/' 
                     ],
-                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/',
                     'subvariant': 'Cloud_Base',
                      }
         },

fedora-container.conf

@@ -1,33 +1,35 @@
 # PRODUCT INFO
-release_name = 'Fedora-Docker'
-release_short = 'Fedora-Docker'
-release_version = '26'
+release_name = 'Fedora-Container'
+release_short = 'Fedora-Container'
+release_version = '28'
 release_is_layered = False
+skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
 bootable = False
-comps_file = 'comps-f26.xml' #{
-#    'scm': 'git',
-#    'repo': 'git://git.fedorahosted.org/git/comps.git',
-#    'branch': None, # defaults to cvs/HEAD or git/master
-#    'file': 'comps-f23.xml',
-#}
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-f28.xml',
+    'command': 'make comps-f28.xml'
+}
 variants_file='variants-fedora.xml'
-sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
+sigkeys = ['9DB62FB1'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
-tree_arches = ['x86_64', 'armhfp']
+tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']
 # limit tree variants
 # if undefined, all variants from variants.xml will be included
-tree_variants = ['Docker']
+tree_variants = ['Container']
 hashed_directories = True
 # RUNROOT settings
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f26-build'
+runroot_tag = 'f28-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f26-updates'
+pkgset_koji_tag = 'f28-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@@ -88,50 +90,51 @@ additional_packages = [
         ],
     }),
 ]
+
 multilib = [
     ('^Everything$', {
         'x86_64': ['devel', 'runtime'],
-         's390x': ['devel', 'runtime']
     })
 ]
 filter_packages = [
-    ('(Workstation|Server|Cloud)$', {
+    ('(Workstation|Server)$', {
         '*': [
-        '^kernel.*debug.*',
-        '^kernel-kdump.*',
-        '^kernel-tools.*',
-        '^syslog-ng.*',
-        '^astronomy-bookmarks',
-        '^generic.*',
-        '^GConf2-dbus.*',
-        '^bluez-gnome',
-        #Periods cause problems in paterns, so replace with *s
-        '^java-1.8.0-openjdk',
-        '^community-mysql.*',
-        '^jruby.*',
-        '^gimp-help-.*',
+        '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*',
+    '*': ['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',
+        'php-devel', 'java-*',
         'httpd-devel', 'tomcat-native', 'php*', 'httpd',
         'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
     ],
 }
 # format: {arch|*: [packages]}
 multilib_whitelist = {
-    '*': ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper',
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
         'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
         'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
-        'syslinux-tftpboot', 'nosync', '*-static'
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
+        'mariadb-connector-odbc', 'compiler-rt'
     ],
 }
+
 createiso_skip = [
         ('^Workstation$', {
             '*': True,
@@ -175,25 +178,28 @@ 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',
-       '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',
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+           'AtomicHost': 'AH',
+    'AtomicWorkstation': 'AW',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
 }
 disc_types = {
     'boot': 'netinst',
@@ -204,34 +210,33 @@ translate_paths = [
 ]
 
 # These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26'
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f28'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = '26'
-global_target = 'f26'
+global_version = '28'
+global_target = 'f28'
 
 image_build = {
-    '^Docker$': [
+    '^Container$': [
         {
             'image-build': {
                     'format': [('docker', 'tar.xz')],
-                    'name': 'Fedora-Docker-Base',
+                    'name': 'Fedora-Container-Base',
                     'kickstart': 'fedora-docker-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['x86_64', 'armhfp'],
-                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/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/f28-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/compose/Everything/$arch/os/' 
                     ],
-                    'subvariant': 'Docker_Base'
+                    'subvariant': 'Container_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"}',
-
+                'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
             },
         },
         {
@@ -241,19 +246,19 @@ image_build = {
                     'kickstart': 'fedora-docker-base-minimal.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['x86_64', 'armhfp'],
-                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/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/f28-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/28/latest-Fedora-28/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_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}',
+                'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
             },
         }
         ],

fedora-final.conf

@@ -0,0 +1,770 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '28'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/fedora-comps.git',
+    'branch': 'master',
+    'file': 'comps-f28.xml',
+    'command': 'make comps-f28.xml'
+}
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
+    'branch': 'f28',
+    'dir': '.'
+}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['9DB62FB1']
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 's390x', '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 = 'f28-build'
+
+## PDC settings
+pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
+pdc_insecure = False
+# This option will skip getting an authentication token via Kerberos.
+pdc_develop = True
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f28-compose'
+pkgset_koji_inherit = True
+
+filter_system_release_packages = False
+
+# GATHER
+gather_method = {
+    '^.*': {                # For all variants
+        'comps': 'deps',    # resolve dependencies for packages from comps file
+        'module': 'nodeps', # but not for packages from modules
+    }
+}
+gather_backend = 'dnf'
+#gather_profiler = True
+check_deps = False
+greedy_method = 'build'
+
+repoclosure_backend = 'dnf'
+
+# 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_deltas = False
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.1-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+buildinstall_skip = [
+    ('^Modular$', {
+        '*': True
+    }),
+]
+
+# 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 = [
+    ('^(Workstation|Server|Everything)$', {
+        '*': [
+            'kernel*',
+            'dracut*',
+            'autocorr-*',
+            'eclipse-nls',
+            'eclipse-nls-*',
+            'hunspell-*',
+            'hyphen-*',
+            'kde-l10n-*',
+            'libreoffice-langpack-*',
+            'man-pages-*',
+            'mythes-*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Workstation$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-1.8.0-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'php-devel', 'java-*',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
+        'mariadb-connector-odbc', 'compiler-rt'
+    ],
+}
+
+createiso_skip = [
+        ('^Workstation$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Modular$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server|Workstation)$', {
+#        '*': [
+#            {
+#                '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.1.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 = []
+# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
+# There is a hard 32-character limit on ISO volume IDs, so we use
+# these to try and produce short enough but legible IDs. Note this is
+# duplicated in Koji for live images, as livemedia-creator does not
+# allow Pungi to tell it what volume ID to use. Note:
+# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
+# '-Workstation-' is a temporary workaround. See
+# https://pagure.io/pungi-fedora/pull-request/525
+volume_id_substitutions = {
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+           'AtomicHost': 'AH',
+    'AtomicWorkstation': 'AW',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
+}
+
+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/f28'
+global_release = '1.1'
+global_version = '28'
+# live_images ignores this in favor of live_target
+global_target = 'f28'
+
+image_build = {
+    '^Container$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
+            },
+        },
+        {
+            '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', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
+            },
+        }
+        ],
+    '^Cloud$': [
+        {
+            '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', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['ppc64', 'ppc64le', 's390x'],
+                     }
+        },
+        {
+            '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': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+            },
+        },
+        ],
+    '^AtomicHost$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-AtomicHost',
+                    'kickstart': 'fedora-atomic.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 6,
+                    'arches': ['aarch64', 'ppc64le', 'x86_64'],
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'AtomicHost',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-AtomicHost-Vagrant',
+                    'kickstart': 'fedora-atomic-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'AtomicHost',
+                    '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','i386'],
+                    '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': 10,
+                    '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 = [
+    ('^Server$', { 
+        '*': ['buildinstall', 'iso'],
+    }),
+    ('^.*$', {
+        # Buildinstall is non blocking
+        'src': ['buildinstall'],
+        # Nothing on i386, ppc64, ppc64le blocks the compose
+        'i386': ['buildinstall', 'iso'],
+        'ppc64': ['buildinstall', 'iso'],
+        'ppc64le': ['buildinstall', 'iso'],
+        's390x': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f28'
+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 = [
+    ("^AtomicWorkstation$", {
+        "x86_64": {
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f28",
+            "repo": "Workstation",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
+            'failable': ['*'],
+        }
+    })
+]
+
+ostree_installer = [
+    ("^AtomicWorkstation$", {
+        "x86_64": {
+            "repo": "Everything",
+            "release": None,
+            "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/atomic/repo/",
+                "ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/",
+                "ostree_osname=fedora-workstation",
+                "ostree_install_ref=fedora/28/x86_64/workstation",
+                "ostree_update_ref=fedora/28/x86_64/workstation",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f28',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'

fedora-modular.conf

@@ -1,232 +0,0 @@
-# PRODUCT INFO
-release_name = 'Fedora-Modular'
-release_short = 'Fedora-Modular'
-release_version = 'Bikeshed'
-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 = 'module-bootstrap-rawhide'
-
-# 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'
-gather_profiler = True
-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", "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$', {
-            '*': False,
-            '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',
-        'Modular': 'M',
-       'Bikeshed': 'BS',
-}
-
-disc_types = {
-    'boot': 'netinst',
-    'live': 'Live',
-}
-
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
-global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = 'Bikeshed'
-# live_images ignores this in favor of live_target
-global_target = 'module-bootstrap-rawhide'
-
-image_build = {
-    '^Server$': [
-        {
-            'image-build': {
-                'format': [('docker', 'tar.xz')],
-                'name': 'Fedora-Modular-Container-Base',
-                'kickstart': 'fedora-modular-container-base.ks',
-                'distro': 'Fedora-28',
-                'disk_size': 4,
-                'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
-                'install_tree_from': 'Server',
-                'subvariant': 'Container_Base',
-            },
-            'factory-parameters': {
-                'dockerversion': '1.10.1',
-                'docker_cmd': '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f28container_modular", "FGC=f28-modular" ]',
-                'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28-modular"}',
-            },
-        },
-        {
-            'image-build': {
-                'format': [('docker', 'tar.xz')],
-                'name': 'Fedora-Modular-Container-Minimal',
-                'kickstart': 'fedora-modular-container-base-minimal.ks',
-                'distro': 'Fedora-28',
-                'disk_size': 4,
-                'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
-                'install_tree_from': 'Server',
-                'subvariant': 'Container_Minimal',
-            },
-            'factory-parameters': {
-                'dockerversion': '1.10.1',
-                'docker_cmd': '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f28container_modular", "FGC=f28-modular" ]',
-                'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28-modular"}',
-            },
-        },
-        {
-            'image-build': {
-                'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
-                'name': 'Fedora-Modular-Server',
-                'kickstart': 'fedora-modular-disk-minimal.ks',
-                'distro': 'Fedora-28',
-                'disk_size': 8,
-                'arches': ['aarch64', 'ppc64le', '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'],
-    })
-]
-
-
-live_images_no_rename = True
-# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
-live_images = [
-  ('^Server$', {
-        'armhfp': {
-                'kickstart': 'fedora-modular-arm-server.ks',
-                'name': 'Fedora-Modular-Server-armhfp',
-                'type': 'appliance',
-                'failable': True,
-                }
-    }),
-]
-
-
-koji_profile = 'compose_koji'

fedora.conf

@@ -1,7 +1,7 @@
 # PRODUCT INFO
 release_name = 'Fedora'
 release_short = 'Fedora'
-release_version = 'Rawhide'
+release_version = '28'
 release_is_layered = False
 
 # GENERAL SETTINGS
@@ -10,8 +10,14 @@ comps_file = {
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
     'branch': 'master',
-    'file': 'comps-rawhide.xml',
-    'command': 'make comps-rawhide.xml'
+    'file': 'comps-f28.xml',
+    'command': 'make comps-f28.xml'
+}
+module_defaults_dir = {
+    'scm': 'git',
+    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
+    'branch': 'f28',
+    'dir': '.'
 }
 
 variants_file='variants-fedora.xml'
@@ -32,6 +38,12 @@ runroot = True
 runroot_channel = 'compose'
 runroot_tag = 'f28-build'
 
+## PDC settings
+pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
+pdc_insecure = False
+# This option will skip getting an authentication token via Kerberos.
+pdc_develop = True
+
 # PKGSET
 pkgset_source = 'koji' # koji, repos
 
@@ -46,8 +58,12 @@ pkgset_koji_inherit = False
 filter_system_release_packages = False
 
 # GATHER
-gather_source = 'comps'
-gather_method = 'deps'
+gather_method = {
+    '^.*': {                # For all variants
+        'comps': 'deps',    # resolve dependencies for packages from comps file
+        'module': 'nodeps', # but not for packages from modules
+    }
+}
 gather_backend = 'dnf'
 gather_profiler = True
 check_deps = False
@@ -75,6 +91,11 @@ create_jigdo = False
 
 # BUILDINSTALL
 buildinstall_method = 'lorax'
+buildinstall_skip = [
+    ('^Modular$', {
+        '*': True
+    }),
+]
 
 # Enables macboot on x86_64 for all variants and disables upgrade image building
 # # everywhere.
@@ -96,7 +117,7 @@ lorax_options = [
 
 # fomat: [(variant_uid_regex, {arch|*: [packages]})]
 additional_packages = [
-    ('.*', {
+    ('^(Workstation|Server|Everything)$', {
         '*': [
             'kernel*',
             'dracut*',
@@ -130,12 +151,6 @@ additional_packages = [
         ],
     }),
 
-    ('^Cloud$', {
-        '*': [
-
-        ],
-    }),
-
 ]
 
 multilib = [
@@ -145,7 +160,7 @@ multilib = [
 ]
 
 filter_packages = [
-    ('(Workstation|Server|Cloud)$', {
+    ('(Workstation|Server)$', {
         '*': [
         'kernel*debug*',
         'kernel-kdump*',
@@ -168,9 +183,7 @@ filter_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',
+        'php-devel', 'java-*',
         'httpd-devel', 'tomcat-native', 'php*', 'httpd',
         'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
     ],
@@ -199,12 +212,12 @@ createiso_skip = [
             'src': True
         }),
 
-        ('^Cloud$', {
+        ('^Everything$', {
             '*': True,
             'src': True
         }),
 
-        ('^Everything$', {
+        ('^Modular$', {
             '*': True,
             'src': True
         }),
@@ -213,7 +226,7 @@ createiso_skip = [
 
 # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
 #extra_files = [
-#    ('^(Server|Workstation|Cloud)$', {
+#    ('^(Server|Workstation)$', {
 #        '*': [
 #            {
 #                'scm': 'rpm',
@@ -236,28 +249,37 @@ image_volid_formats = [
      ]
 # 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.
+# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
+# There is a hard 32-character limit on ISO volume IDs, so we use
+# these to try and produce short enough but legible IDs. Note this is
+# duplicated in Koji for live images, as livemedia-creator does not
+# allow Pungi to tell it what volume ID to use. Note:
+# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
+# '-Workstation-' is a temporary workaround. See
+# https://pagure.io/pungi-fedora/pull-request/525
 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',
-'WorkstationOstree': 'WS',
-      'Workstation': 'WS',
-       'Everything': 'E',
-           'Server': 'S',
-            'Cloud': 'C',
-            'Alpha': 'A',
-             'Beta': 'B',
-               'TC': 'T',
+                 'Beta': 'B',
+              'Rawhide': 'rawh',
+        'Astronomy_KDE': 'AstK',
+           'AtomicHost': 'AH',
+    'AtomicWorkstation': 'AW',
+             'Cinnamon': 'Cinn',
+                'Cloud': 'C',
+         'Design_suite': 'Dsgn',
+       'Electronic_Lab': 'Elec',
+           'Everything': 'E',
+                'Games': 'Game',
+               'Images': 'img',
+              'Jam_KDE': 'Jam',
+          'MATE_Compiz': 'MATE',
+     # Note https://pagure.io/pungi-fedora/issue/533
+     'Python-Classroom': 'Clss',
+     'Python_Classroom': 'Clss',
+             'Robotics': 'Robo',
+       'Scientific_KDE': 'SciK',
+             'Security': 'Sec',
+               'Server': 'S',
+        '-Workstation-': '-WS-',
 }
 
 disc_types = {
@@ -270,9 +292,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/f28'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = 'Rawhide'
+global_version = '28'
 # live_images ignores this in favor of live_target
 global_target = 'f28'
 
@@ -285,7 +307,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Base',
@@ -294,8 +316,8 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
-                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
+                'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
             },
         },
         {
@@ -305,7 +327,7 @@ image_build = {
                     'kickstart': 'fedora-docker-base-minimal.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
-                    'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
+                    'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Minimal_Base',
@@ -314,12 +336,12 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
-                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
+                'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
             },
         }
         ],
-    '^CloudImages$': [
+    '^Cloud$': [
         {
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
@@ -327,11 +349,11 @@ image_build = {
                     'kickstart': 'fedora-cloud-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 4,
-                    'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
-                    'repo': 'Cloud',
-                    'install_tree_from': 'Cloud',
+                    'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
                     'subvariant': 'Cloud_Base',
-                    'failable': ['aarch64', 'ppc64', 'ppc64le'],
+                    'failable': ['ppc64', 'ppc64le', 's390x'],
                      }
         },
         {
@@ -342,35 +364,37 @@ image_build = {
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'repo': 'Cloud',
-                    'install_tree_from': 'Cloud',
+                    'repo': 'Everything',
+                    'install_tree_from': 'Everything',
                     'subvariant': 'Cloud_Base',
                     'failable': ['*'],
             },
         },
+        ],
+    '^AtomicHost$': [
         {
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
-                    'name': 'Fedora-Atomic',
+                    'name': 'Fedora-AtomicHost',
                     'kickstart': 'fedora-atomic.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 6,
                     'arches': ['aarch64', 'ppc64le', 'x86_64'],
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'AtomicHost',
                     'failable': ['*'],
                      }
         },
         {
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
-                    'name': 'Fedora-Atomic-Vagrant',
+                    'name': 'Fedora-AtomicHost-Vagrant',
                     'kickstart': 'fedora-atomic-vagrant.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'AtomicHost',
                     'failable': ['*'],
                      },
             'factory-parameters': {
@@ -608,8 +632,7 @@ failable_deliverables = [
     ('^.*$', {
         # Buildinstall is non blocking
         'src': ['buildinstall'],
-        # Nothing on aarch64, i386, ppc64, ppc64le blocks the compose
-        'aarch64': ['buildinstall', 'iso'],
+        # Nothing on i386, ppc64, ppc64le blocks the compose
         'i386': ['buildinstall', 'iso'],
         'ppc64': ['buildinstall', 'iso'],
         'ppc64le': ['buildinstall', 'iso'],
@@ -708,50 +731,54 @@ live_images = [
 ]
 
 ostree = [
-    ("^Atomic$", {
+    ("^AtomicHost$", {
         "aarch64": {
             "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
             "treefile": "fedora-atomic-host.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
-            "config_branch": "master",
+            "config_branch": "f28",
             "repo": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             'failable': ['*'],
         },
         "x86_64": {
             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
             "treefile": "fedora-atomic-host.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
-            "config_branch": "master",
+            "config_branch": "f28",
             "repo": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             'failable': ['*'],
         },
         "ppc64le": {
             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
             "treefile": "fedora-atomic-host.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
-            "config_branch": "master",
+            "config_branch": "f28",
             "repo": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             'failable': ['*'],
         }
     }),
-    ("^ostree$", {
+    ("^AtomicWorkstation$", {
         "x86_64": {
             "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
             "treefile": "fedora-ostree-workstation.json",
             "config_url": "https://pagure.io/workstation-ostree-config.git",
-            "config_branch": "master",
+            "config_branch": "f28",
             "repo": "Workstation",
-            "ostree_repo": "/mnt/koji/compose/ostree/rawhide/",
+	    "tag_ref": False,
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             'failable': ['*'],
         }
     })
 ]
 
 ostree_installer = [
-    ("^Atomic$", {
+    ("^AtomicHost$", {
         "x86_64": {
             "repo": "Everything",
             "release": None,
@@ -759,14 +786,14 @@ ostree_installer = [
             "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/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-atomic",
-                "ostree_install_ref=fedora/rawhide/x86_64/atomic-host",
-                "ostree_update_ref=fedora/rawhide/x86_64/atomic-host",
+                "ostree_install_ref=fedora/28/x86_64/atomic-host",
+                "ostree_update_ref=fedora/28/x86_64/atomic-host",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f28',
             'failable': ['*'],
         },
         "aarch64": {
@@ -776,14 +803,14 @@ ostree_installer = [
             "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/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-atomic",
-                "ostree_install_ref=fedora/rawhide/aarch64/atomic-host",
-                "ostree_update_ref=fedora/rawhide/aarch64/atomic-host",
+                "ostree_install_ref=fedora/28/aarch64/atomic-host",
+                "ostree_update_ref=fedora/28/aarch64/atomic-host",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f28',
             'failable': ['*'],
         },
         "ppc64le": {
@@ -793,18 +820,18 @@ ostree_installer = [
             "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/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-atomic",
-                "ostree_install_ref=fedora/rawhide/ppc64le/atomic-host",
-                "ostree_update_ref=fedora/rawhide/ppc64le/atomic-host",
+                "ostree_install_ref=fedora/28/ppc64le/atomic-host",
+                "ostree_update_ref=fedora/28/ppc64le/atomic-host",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f28',
             'failable': ['*'],
         }
     }),
-    ("^WorkstationOstree$", {
+    ("^AtomicWorkstation$", {
         "x86_64": {
             "repo": "Everything",
             "release": None,
@@ -812,14 +839,14 @@ ostree_installer = [
             "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/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-workstation",
-                "ostree_install_ref=fedora/rawhide/x86_64/workstation",
-                "ostree_update_ref=fedora/rawhide/x86_64/workstation",
+                "ostree_install_ref=fedora/28/x86_64/workstation",
+                "ostree_update_ref=fedora/28/x86_64/workstation",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f28',
             'failable': ['*'],
         }
     })

nightly-modular.sh

@@ -1,109 +0,0 @@
-#!/bin/sh
-
-#set -x
-
-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="bikeshed"
-RELEASE_TITLE="Bikeshed"
-TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
-TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
-FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
-RSYNCPREFIX="sudo -u ftpsync"
-RSYNCTARGET="/pub/fedora/linux/modular/development/$RELEASE"
-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 --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
-
-if [ -z "$COMPOSE_ID" ]; then
-    CMD="$CMD --target-dir=$TARGET_DIR"
-else
-    CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
-fi
-
-time $CMD "$@"
-if [ "$?" != "0" ]; then
-    exit 1
-fi
-
-NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
-SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||g')
-
-# Set this to use later for a few items include depcheck
-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")
-
-compose-changelog -p $DESTDIR/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $DESTDIR/
-# Figure out a version for broken deps e-mail that goes to package maintainers.
-# For Bikeshed it's just bikeshed, for branched versions we prepend F- to the number.
-if [ "$RELEASE" = "bikeshed" ]; then
-    TREENAME="$RELEASE"
-else
-    TREENAME="F-$RELEASE"
-fi
-/usr/share/mash/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Server/" >"$DESTDIR/logs/depcheck"
-
-# Tell interested persons that the rsync is starting (zomg!)
-send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
-
-# Sync the content to /pub/fedora
-if [ ! -d "$RSYNCTARGET" ]; then
-  mkdir "$RSYNCTARGET"
-fi
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \
-    "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Server \
-    --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \
-    "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Server \
-    --delete-after
-$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
-$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
-
-# Tell interested persons that the rsync is done.
-send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
-
-# Tell everyone by fedmsg about the compose
-send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
-
-# Tell everyone by email about the compose
-SUBJECT='Fedora Modular '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
-for tomail in $TOMAIL ; do
-    cat $DESTDIR/logs/*verbose | \
-         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
-done
-
-# 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,27 +4,23 @@
 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")
 SHORT="Fedora"
-RELEASE="rawhide"
-RELEASE_TITLE="Rawhide"
-COMPSFILE="comps-rawhide.xml"
+RELEASE="28"
+RELEASE_TITLE="28"
+COMPSFILE="comps-f28.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$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"
 RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
 RSYNCALTTARGET="/pub/alt/development/$RELEASE"
 RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE"
-ATOMIC=$(mktemp -d /tmp/atomic.${RELEASE}.$DATE.XXXX)
-ATOMICHOSTREPO="/mnt/koji/compose/atomic/$RELEASE/"
-ATOMICWSREPO="/mnt/koji/compose/ostree/$RELEASE/"
-ATOMICHOSTDEST="/mnt/koji/atomic/$RELEASE/"
 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"
@@ -58,7 +54,6 @@ send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
 #popd
 
 ./releng/scripts/block_retired.py --profile compose_koji
-./releng/scripts/block_retired.py --profile compose_koji --namespace=docker
 ./releng/scripts/block_retired.py --profile compose_koji --namespace=container
 
 CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
@@ -88,7 +83,7 @@ fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "shor
 fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION", "$ALT_LOCATION", "$SECONDARY_LOCATION")
 
 # Fix permissions on the grub efi files and fonts (they're 0600)
-chmod -R go+r "$DESTDIR/compose/*/*/os/EFI/"
+chmod -R go+r $DESTDIR/compose/*/*/os/EFI/
 
 compose-changelog -p $DESTDIR/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $DESTDIR/
 # Figure out a version for broken deps e-mail that goes to package maintainers.
@@ -98,16 +93,13 @@ if [ "$RELEASE" = "rawhide" ]; then
 else
     TREENAME="F-$RELEASE"
 fi
-/usr/share/mash/spam-o-matic --treename="$TREENAME" "$DESTDIR/compose/Everything/" >"$DESTDIR/logs/depcheck"
+# disable sending email for now as spam-o-matic does not understand Rich dependencies 
+/usr/share/mash/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" >"$DESTDIR/logs/depcheck"
 
 [ -z "$ARCH" ] && {
-./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
+./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
 }
 
-# prune atomic host and atomic workstation repos
-ostree prune --repo=$ATOMICHOSTREPO --keep-younger-than="14 days ago" --refs-only
-ostree prune --repo=$ATOMICWSREPO --keep-younger-than="14 days ago" --refs-only
-
 # Tell interested persons that the rsync is starting (zomg!)
 send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
 
@@ -117,20 +109,24 @@ if [ ! -d "$RSYNCTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
+    --variant Everything --variant AtomicHost --variant Cloud --variant Container \
+    --variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
+    --variant Everything --variant AtomicHost --variant Cloud --variant Container \
+    --variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
-# aarch64 for Server and Everything is primary
+# aarch64 for Everything Server Cloud Container is primary
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server \
+    --variant Everything --variant Server --variant Cloud --variant Container \
+    --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server --variant \
+    --variant Everything --variant Server --variant Cloud --variant Container \
+    --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
@@ -141,11 +137,11 @@ if [ ! -d "$RSYNCALTTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
     "$DESTDIR" "$RSYNCALTTARGET/" \
-    --variant Cloud --variant Labs \
+    --variant Labs \
     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
     "$DESTDIR" "$RSYNCALTTARGET/" \
-    --variant Cloud --variant Labs \
+    --variant Labs \
     --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"
@@ -156,23 +152,29 @@ if [ ! -d "$RSYNCSECTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
+    --variant Everything --variant AtomicHost --variant Cloud --variant Container \
+    --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
+    --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata
+$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
+    "$DESTDIR" "$RSYNCSECTARGET/" \
+    --variant Everything --variant AtomicHost --variant Cloud --variant Container \
+    --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
+    --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after
+# aarch64 is alternative for AtomicHost Labs Spins Workstation
+$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
+    "$DESTDIR" "$RSYNCSECTARGET/" \
+    --variant AtomicHost --variant Labs --variant Spins --variant Workstation \
     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
+$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCSECTARGET/" \
-    --link-dest="$RSYNCTARGET/Everything/" --delete-after
-# aarch64 is alternative for Atomic Cloud CloudImages Container Labs Spins Workstation
-$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
-    "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
-    --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
-    "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
+    --variant AtomicHost --variant Labs --variant Spins --variant Workstation \
     --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
 
-$RSYNCPREFIX rsync -avhH --delete-after $ATOMICHOSTREPO $ATOMICHOSTDEST
+
+# FYI: syncing of ostrees happens in new-updates-sync script
+# https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/bodhi2/backend/files/new-updates-sync
 
 # Tell interested persons that the rsync is done.
 send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
@@ -181,23 +183,13 @@ send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
 send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
 
 # Tell everyone by email about the compose
+# "$DESTDIR/logs/depcheck" lets not cat out depcheck for now as it does
+# not understand rich dependencies
 SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
 for tomail in $TOMAIL ; do
-    cat $DESTDIR/logs/*verbose $DESTDIR/logs/depcheck | \
+    cat $DESTDIR/logs/*verbose  | \
          mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
 done
 
-for koji in arm ppc s390
-do
-  if [ "$koji" = "arm" ]; then
-     arches=aarch64
-  elif [ "$koji" = "ppc" ]; then
-     arches=ppc64,ppc64le
-  elif [ "$koji" = "s390" ]; then
-     arches=s390x
-  fi
-  ./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.sh

@@ -5,13 +5,13 @@ LABEL=$1
 # to the script are passed to pungi-koji directly.
 shift
 CONFIG="fedora-final.conf"
-TARGET_DIR="/mnt/koji/compose/26"
+TARGET_DIR="/mnt/koji/compose/28"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY=""
 SKIP_PHASES="--skip-phase=productimg"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
-COMPSFILE="comps-f26.xml"
+COMPSFILE="comps-f28.xml"
 TMPDIR=`mktemp -d /tmp/fedoraRC.$DATE.XXXX`
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
@@ -23,7 +23,7 @@ git clone https://pagure.io/fedora-comps.git && {
     popd
 }
 popd
-CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
+CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
 if [ -z "$COMPOSE_ID" ]; then
     CMD="$CMD --target-dir=$TARGET_DIR"
 else

twoweek-nightly.sh

@@ -8,14 +8,13 @@ CONFIG="fedora-atomic.conf"
 TARGET_DIR="/mnt/koji/compose/twoweek"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY=""
-SKIP_PHASES="--skip-phase=productimg --skip-phase=extra_files"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-Atomic"
-RELEASE="27"
-RELEASE_TITLE="27"
-COMPSFILE="comps-f27.xml"
+RELEASE="28"
+RELEASE_TITLE="28"
+COMPSFILE="comps-f28.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
 FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
@@ -24,7 +23,8 @@ 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
+
+# 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
@@ -40,15 +40,7 @@ FEDMSG_CERTPREFIX="releng"
 . ./releng/scripts/fedmsg-functions.sh
 # Announce that we are starting...
 send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
-pushd $TMPDIR
-git clone https://pagure.io/fedora-comps.git && {
-    pushd fedora-comps
-    make "${COMPSFILE}"
-    cp "${COMPSFILE}" $DEST/
-    popd
-}
-popd
-CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
+CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY --label=$LABEL"
 if [ -z "$COMPOSE_ID" ]; then
     CMD="$CMD --target-dir=$TARGET_DIR"
 else

variants-fedora.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE variants PUBLIC "-//Red Hat, Inc.//DTD Variants info//EN" "variants2012.dtd">
 <variants>
-    <variant id="Atomic" name="Atomic" type="variant" is_empty="true">
+    <variant id="AtomicHost" name="AtomicHost" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
             <arch>x86_64</arch>
             <arch>ppc64le</arch>
         </arches>
     </variant>
-    <variant id="CloudImages" name="CloudImages" type="variant" is_empty="true">
+    <variant id="Cloud" name="Cloud" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
-            <arch>i386</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -23,6 +23,7 @@
             <arch>armhfp</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -44,11 +45,6 @@
             <arch>x86_64</arch>
         </arches>
     </variant>
-    <variant id="ostree" name="ostree" type="variant" is_empty="true">
-        <arches>
-            <arch>x86_64</arch>
-        </arches>
-    </variant>
     <variant id="Server" name="Server" type="variant">
         <arches>
             <arch>armhfp</arch>
@@ -129,7 +125,7 @@
           <environment display_order="10">workstation-product-environment</environment>
         </environments>
     </variant>
-    <variant id="WorkstationOstree" name="Workstation Ostree" type="variant" is_empty="true">
+    <variant id="AtomicWorkstation" name="AtomicWorkstation" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>
@@ -137,42 +133,22 @@
             <arch>x86_64</arch>
         </arches>
     </variant>
-    <variant name="Cloud" id="Cloud" type="variant">
+    <variant id="Modular" name="Modular" type="variant">
         <arches>
-            <arch>aarch64</arch>
             <arch>armhfp</arch>
+            <arch>aarch64</arch>
             <arch>i386</arch>
             <arch>ppc64</arch>
             <arch>ppc64le</arch>
+            <arch>s390x</arch>
             <arch>x86_64</arch>
         </arches>
-        <groups>
-            <group default="true">cloud-server</group>
-            <group default="true">core</group>
-            <group default="true">standard</group>
-            <group default="true">headless-management</group>
-            <group default="true">dogtag</group>
-            <group default="true">directory-server</group>
-            <group default="true">dns-server</group>
-            <group default="true">freeipa-server</group>
-            <group default="true">ftp-server</group>
-            <group default="true">guest-agents</group>
-            <group default="true">ha</group>
-            <group default="true">load-balancer</group>
-            <group default="true">mail-server</group>
-            <group default="true">mysql</group>
-            <group default="true">network-server</group>
-            <group default="true">smb-server</group>
-            <group default="true">sql-server</group>
-            <group default="true">web-server</group>
-            <!-- 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>
-        </environments>
+        <modules>
+            <module>django:1.6:20180307130104</module>
+            <module>reviewboard:2.5:20180206144254</module>
+            <module>nodejs:6:20180308155546</module>
+            <module>nodejs:8:20180308143646</module>
+            <module>nodejs:9:20180308142225</module>
+        </modules>
     </variant>
 </variants>

variants-modular.xml

@@ -1,76 +0,0 @@
-<?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>armhfp</arch>
-            <arch>aarch64</arch>
-            <arch>i386</arch>
-            <arch>ppc64</arch>
-            <arch>ppc64le</arch>
-            <arch>s390x</arch>
-            <arch>x86_64</arch>
-        </arches>
-        <modules>
-            <module>hardware-support-master</module>
-            <module>host-master</module>
-            <module>installer-master</module>
-            <module>perl-master</module>
-            <module>platform-master</module>
-
-            <module>cloud-init-master</module>
-            <!--cockpit included in platform -->
-            <module>freeipa-master</module>
-            <module>networking-base-master</module>
-            <module>postgresql-master</module>
-            <module>udisks2-master</module>
-            
-            <module>389-ds-master</module>
-            <module>X11-base-master</module>
-            <module>apache-commons-master</module>
-            <module>bind-master</module>
-            <module>fonts-master</module>
-            <module>httpd-master</module>
-            <module>java-master</module>
-            <module>krb5-master</module>
-            <module>pki-master</module>
-            <module>python2-ecosystem-master</module>
-            <module>python2-master</module>
-            <module>python3-ecosystem-master</module>
-            <module>python3-master</module>
-            <module>resteasy-master</module>
-            <module>samba-master</module>
-            <module>sssd-master</module>
-            <module>tomcat-master</module>
-
-            <module>autotools-master</module>
-            <module>cmake-master</module>
-            <!-- not ready: <module>gtk2-master</module> -->
-            <!-- not ready: <module>gtk3-master</module> -->
-            <module>help2man-master</module>
-            <!-- not ready: <module>systemtap-master</module> -->
-            <!-- not ready: <module>texlive-master</module> -->
-
-            <!-- not ready: <module>cassandra-master</module> -->
-            <module>mariadb-master</module>
-            <module>maven-master</module>
-            <!-- not ready: <module>mongodb-master</module> -->
-            <module>mysql-master</module>
-            <module>ninja-master</module>
-            <module>meson-master</module>
-            <!-- not ready: <module>nginx-master</module> -->
-            <!-- not ready: <module>nis-master</module> -->
-            <!-- not ready: <module>nodejs-master</module> -->
-            <module>nodejs-6</module>
-            <module>nodejs-8</module>
-            <!-- not ready: <module>passenger-master</module> -->
-            <!-- not ready: <module>php-master</module> -->
-            <!-- not ready: <module>redis-master</module> -->
-            <!-- not ready: <module>ruby-master</module> -->
-            <module>system-tools-master</module>
-            <!-- not ready: <module>varnish-master</module> -->
-
-            <module>libtom-master</module>
-        </modules>
-    </variant>
-</variants>