update nightly for f26 secondary (s390x)

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
update for s390x branched
2017-04-13 17:11:31 +01:00 · 2017-04-12 10:12:43 +01:00 · 2017-04-05 13:28:17 -04:00 · 2017-04-03 17:24:33 -04:00 · 2017-03-31 15:50:54 -04:00 · 2017-03-31 13:52:39 -05:00
7 changed files with 1552 additions and 99 deletions
--- a/fedora-alpha.conf
+++ b/fedora-alpha.conf
@ -0,0 +1,648 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '26'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f26.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['64DAB85D']
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['aarch64', 'armhfp', 'i386', 'ppc64', 'ppc64le', 'x86_64']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+runroot_channel = 'compose'
+runroot_tag = 'f26-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f26-compose'
+pkgset_koji_inherit = True 
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# fomat: [(variant_uid_regex, {arch|*: [repos]})]
+# gather_lookaside_repos = []
+
+# GATHER - JSON
+# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
+#gather_source_mapping = '/path/to/mapping.json'
+
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(label)s-%(arch)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     }
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('.*', {
+        '*': [
+            'kernel*',
+            'dracut*',
+            'autocorr-*',
+            'eclipse-nls-*',
+            'hunspell-*',
+            'hyphen-*',
+            'calligra-l10n-*',
+            'kde-l10n-*',
+            'libreoffice-langpack-*',
+            'man-pages-*',
+            'mythes-*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Workstation$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Cloud$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-1.8.0-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers'
+    ],
+}
+
+createiso_skip = [
+        ('^Workstation$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Cloud$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server|Workstation|Cloud)$', {
+#        '*': [
+#            {
+#                'scm': 'rpm',
+#                'repo': 'fedora-release-%(variant_id_lower)s',
+#                'branch': None,
+#                'file': [
+#                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
+#                ],
+#                'target': '',
+#            },
+#        ],
+#    }),
+#]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(label)s.iso'
+# # Use the same format for volume id
+image_volid_formats = [
+     '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
+     ]
+# No special handling for layered products, use same format as for regular images
+image_volid_layered_product_formats = []
+# Replace 'Cloud' with 'C' in volume id etc.
+volume_id_substitutions = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
+]
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26'
+global_release = "1.7"
+global_version = '26_Alpha'
+# live_images ignores this in favor of live_target
+global_target = 'f26'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Docker_Base'
+                    'failable': ['*'],
+                    },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')]
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-docker-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base'
+                    'failable': ['*'],
+                    }
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['aarch64', 'x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base'
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+                     }
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom'
+                    'failable': ['*'],
+                     }
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            },
+            {
+                'name': 'Fedora-LXQt-Live',
+                'kickstart': 'fedora-live-lxqt.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXQt'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f26'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxqt.ks',
+                'name': 'Fedora-LXQt-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXQt',
+                'failable': True,
+                },]
+    }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
+]
+
+ostree = [
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f26",
+            "source_repo_from": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/26/",
+            'failable': ['*'],
+        }
+    })
+]
+
+ostree_installer = [
+    ("^Workstation$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "installpkgs": ["fedora-productimg-workstation"],
+            "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/26/x86_64/workstation",
+            ],
+            "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/26/",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/26/x86_64/workstation",
+            ]
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f26',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'
--- a/fedora-docker.conf
+++ b/fedora-docker.conf
@ -27,7 +27,7 @@ runroot_channel = 'compose'
 runroot_tag = 'f26-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f25-updates'
+pkgset_koji_tag = 'f26-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@ -221,7 +221,18 @@ image_build = {
                    ],
                    'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
                    'subvariant': 'Docker_Base'
-                    }
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26docker", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
        }
        ],
 }
--- a/fedora-s390.conf
+++ b/fedora-s390.conf
@ -0,0 +1,738 @@
+# PRODUCT INFO
+release_name = 'Fedora'
+release_short = 'Fedora'
+release_version = '26'
+release_is_layered = False
+
+# GENERAL SETTINGS
+bootable = True
+comps_file = 'comps-f26.xml' #{
+#    'scm': 'git',
+#    'repo': 'https://pagure.io/fedora-comps.git',
+#    'branch': None, # defaults to cvs/HEAD or git/master
+#    'file': 'comps-f23.xml',
+#}
+
+variants_file='variants-fedora.xml'
+sigkeys = ['64DAB85D', '3B921D09', None] # None = unsigned
+
+# limit tree architectures
+# if undefined, all architectures from variants.xml will be included
+tree_arches = ['s390x']
+
+# limit tree variants
+# if undefined, all variants from variants.xml will be included
+#tree_variants = ['Server']
+tree_variants = ["Everything", "Server"]
+
+hashed_directories = True
+
+# RUNROOT settings
+runroot = True
+runroot_channel = 'compose'
+runroot_tag = 'f26-build'
+
+# PKGSET
+pkgset_source = 'koji' # koji, repos
+
+# PKGSET - REPOS
+# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+# pkgset_repos = {}
+
+# PKGSET - KOJI
+pkgset_koji_tag = 'f26'
+pkgset_koji_inherit = False
+
+filter_system_release_packages = False
+
+# GATHER
+gather_source = 'comps'
+gather_method = 'deps'
+check_deps = False
+greedy_method = 'build'
+
+# fomat: [(variant_uid_regex, {arch|*: [repos]})]
+# gather_lookaside_repos = []
+
+# GATHER - JSON
+# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
+#gather_source_mapping = '/path/to/mapping.json'
+
+
+# CREATEREPO
+createrepo_c = True
+createrepo_checksum = 'sha256'
+createrepo_deltas = True
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s'
+#jigdo
+create_jigdo = False
+
+# BUILDINSTALL
+buildinstall_method = 'lorax'
+
+# Enables macboot on x86_64 for all variants and disables upgrade image building
+# # everywhere.
+lorax_options = [
+  ('^.*$', {
+     'x86_64': {
+         'nomacboot': False
+     },
+     '*': {
+         'noupgrade': True
+     }
+  })
+]
+
+#extra_packages = [
+#    '/mnt/packages/foo*',
+#]
+
+
+# fomat: [(variant_uid_regex, {arch|*: [packages]})]
+additional_packages = [
+    ('.*', {
+        '*': [
+            'kernel*',
+            'dracut*',
+            'autocorr-*',
+            'eclipse-nls-*',
+            'hunspell-*',
+            'hyphen-*',
+            'calligra-l10n-*',
+            'kde-l10n-*',
+            'libreoffice-langpack-*',
+            'man-pages-*',
+            'mythes-*',
+        ],
+    }),
+
+    ('^Everything$', {
+        '*': [
+            '*',
+        ],
+    }),
+
+    ('^Server$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Workstation$', {
+        '*': [
+
+        ],
+    }),
+
+    ('^Cloud$', {
+        '*': [
+
+        ],
+    }),
+
+]
+
+multilib = [
+    ('^Everything$', {
+        'x86_64': ['devel', 'runtime'],
+    })
+]
+
+filter_packages = [
+    ('(Workstation|Server|Cloud)$', {
+        '*': [
+        'kernel*debug*',
+        'kernel-kdump*',
+        'kernel-tools*',
+        'syslog-ng*',
+        'astronomy-bookmarks',
+        'generic*',
+        'GConf2-dbus*',
+        'bluez-gnome',
+        'java-1.8.0-openjdk',
+        'community-mysql*',
+        'jruby*',
+        'gimp-help-*',
+        ]
+    }),
+]
+
+
+# format: {arch|*: [packages]}
+multilib_blacklist = {
+    '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
+        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
+        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
+        'php-devel', 'java-1.6.0-openjdk-devel',
+        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
+        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
+    ],
+}
+
+
+# format: {arch|*: [packages]}
+multilib_whitelist = {
+    '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
+        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
+        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
+        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
+        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
+        'fakechroot-libs','mesa-vdpau-drivers'
+    ],
+}
+
+createiso_skip = [
+        ('^Workstation$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Server$', {
+            'src': True
+        }),
+
+        ('^Cloud$', {
+            '*': True,
+            'src': True
+        }),
+
+        ('^Everything$', {
+            '*': True,
+            'src': True
+        }),
+
+    ]
+
+# fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]
+#extra_files = [
+#    ('^(Server|Workstation|Cloud)$', {
+#        '*': [
+#            {
+#                'scm': 'rpm',
+#                'repo': 'fedora-release-%(variant_id_lower)s',
+#                'branch': None,
+#                'file': [
+#                    '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release',
+#                ],
+#                'target': '',
+#            },
+#        ],
+#    }),
+#]
+
+# Image name respecting Fedora's image naming policy
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(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 = {
+        'Rawhide': 'rawh',
+         'Images': 'img',
+    'MATE_Compiz': 'MATE',
+       'Security': 'Sec',
+ 'Electronic_Lab': 'Elec',
+       'Robotics': 'Robo',
+ 'Scientific_KDE': 'SciK',
+  'Astronomy_KDE': 'AstK',
+   'Design_suite': 'Dsgn',
+          'Games': 'Game',
+        'Jam_KDE': 'Jam',
+    'Workstation': 'WS',
+     'Everything': 'E',
+         'Server': 'S',
+          'Cloud': 'C',
+          'Alpha': 'A',
+           'Beta': 'B',
+             'TC': 'T',
+}
+
+disc_types = {
+    'boot': 'netinst',
+    'live': 'Live',
+}
+
+translate_paths = [
+   ('/mnt/koji/compose/', 'http://s390pkgs.fedoraproject.org/compose/'),
+]
+
+# These will be inherited by live_media, live_images and image_build
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26'
+global_release = None
+global_version = '26'
+# live_images ignores this in favor of live_target
+global_target = 'f26'
+
+image_build = {
+    '^Docker$': [
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Docker-Base',
+                    'kickstart': 'fedora-docker-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Docker_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26docker", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
+        },
+        {
+            'image-build': {
+                    'format': [('docker', 'tar.xz')],
+                    'name': 'Fedora-Container-Minimal-Base',
+                    'kickstart': 'fedora-docker-base-minimal.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
+                    'failable': ['*'],
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26docker", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora-minimal',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
+        }
+        ],
+    '^CloudImages$': [
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Cloud-Base',
+                    'kickstart': 'fedora-cloud-base.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 4,
+                    'arches': ['s390x'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Cloud-Base-Vagrant',
+                    'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Cloud_Base',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        {
+            'image-build': {
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
+                    'name': 'Fedora-Atomic',
+                    'kickstart': 'fedora-atomic.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 6,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic',
+                    'failable': ['*'],
+                     }
+        },
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Atomic-Vagrant',
+                    'kickstart': 'fedora-atomic-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Cloud',
+                    'install_tree_from': 'Cloud',
+                    'subvariant': 'Atomic',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+}
+
+live_media = {
+    '^Workstation$': [
+            {
+                'name': 'Fedora-Workstation-Live',
+                'kickstart': 'fedora-live-workstation.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'subvariant': 'Workstation'
+
+            }
+        ],
+    '^Spins': [
+            {
+                'name': 'Fedora-KDE-Live',
+                'kickstart': 'fedora-live-kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'KDE'
+
+            },
+            {
+                'name': 'Fedora-Xfce-Live',
+                'kickstart': 'fedora-live-xfce.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Xfce'
+            },
+            {
+                'name': 'Fedora-SoaS-Live',
+                'kickstart': 'fedora-live-soas.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'SoaS'
+            },
+            {
+                'name': 'Fedora-Cinnamon-Live',
+                'kickstart': 'fedora-live-cinnamon.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Cinnamon'
+            },
+            {
+                'name': 'Fedora-LXDE-Live',
+                'kickstart': 'fedora-live-lxde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXDE'
+            },
+            {
+                'name': 'Fedora-MATE_Compiz-Live',
+                'kickstart': 'fedora-live-mate_compiz.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Mate'
+            },
+            {
+                'name': 'Fedora-LXQt-Live',
+                'kickstart': 'fedora-live-lxqt.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'LXQt'
+            }
+        ],
+    '^Labs$': [
+            {
+                'name': 'Fedora-Astronomy_KDE-Live',
+                'kickstart': 'fedora-live-astronomy_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Astronomy_KDE'
+            },
+            {
+                'name': 'Fedora-Design_suite-Live',
+                'kickstart': 'fedora-live-design_suite.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Design_suite'
+            },
+            {
+                'name': 'Fedora-Scientific_KDE-Live',
+                'kickstart': 'fedora-live-scientific_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Scientific_KDE'
+            },
+            {
+                'name': 'Fedora-Games-Live',
+                'kickstart': 'fedora-live-games.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Games'
+            },
+            {
+                'name': 'Fedora-Security-Live',
+                'kickstart': 'fedora-live-security.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Security'
+            },
+            {
+                'name': 'Fedora-Jam_KDE-Live',
+                'kickstart': 'fedora-live-jam_kde.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Jam_KDE'
+            },
+            {
+                'name': 'Fedora-Robotics-Live',
+                'kickstart': 'fedora-live-robotics.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Robotics'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
+            }
+    ],
+}
+
+failable_deliverables = [
+    ('^.*$', {
+        # Buildinstall can fail on any variant and any arch
+        'src': ['buildinstall'],
+        # Nothing on i386 blocks the compose
+        'i386': ['buildinstall', 'iso'],
+    })
+]
+
+live_target = 'f26'
+live_images_no_rename = True
+# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
+live_images = [
+    ('^Workstation$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-workstation.ks',
+                'name': 'Fedora-Workstation-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Server$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-server.ks',
+                'name': 'Fedora-Server-armhfp',
+                'type': 'appliance',
+                'failable': True,
+                }
+    }),
+    ('^Spins$', {
+        'armhfp': [{
+                'kickstart': 'fedora-arm-kde.ks',
+                'name': 'Fedora-KDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'KDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxde.ks',
+                'name': 'Fedora-LXDE-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXDE',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-mate.ks',
+                'name': 'Fedora-Mate-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Mate',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-minimal.ks',
+                'name': 'Fedora-Minimal-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Minimal',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-soas.ks',
+                'name': 'Fedora-SoaS-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'SoaS',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-xfce.ks',
+                'name': 'Fedora-Xfce-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Xfce',
+                'failable': True,
+                },
+                {
+                'kickstart': 'fedora-arm-lxqt.ks',
+                'name': 'Fedora-LXQt-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'LXQt',
+                'failable': True,
+                },]
+    }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
+]
+
+ostree = [
+    ("^Atomic$", {
+        "aarch64": {
+            "treefile": "fedora-atomic-docker-host.json",
+            "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f26",
+            "source_repo_from": "Everything",
+            "ostree_repo": "/mnt/koji/compose/atomic/26/",
+            'failable': ['*'],
+        },
+        "x86_64": {
+            "treefile": "fedora-atomic-docker-host.json",
+            "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f26",
+            "source_repo_from": "Everything",
+            "ostree_repo": "/mnt/koji/compose/atomic/26/",
+            'failable': ['*'],
+        }
+    }),
+    ("^ostree$", {
+        "x86_64": {
+            "treefile": "fedora-ostree-workstation.json",
+            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f26",
+            "source_repo_from": "Workstation",
+            "ostree_repo": "/mnt/koji/compose/ostree/26/",
+            'failable': ['*'],
+        }
+    })
+]
+
+ostree_installer = [
+    ("^Atomic$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "rootfs_size": "3",
+            "installpkgs": ["fedora-productimg-atomic"],
+            "add_template": ["atomic-installer/lorax-configure-repo.tmpl",
+                             "atomic-installer/lorax-embed-repo.tmpl"],
+            "add_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/26/",
+                "ostree_osname=fedora-atomic",
+                "ostree_ref=fedora/26/x86_64/atomic-host",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f26',
+            'failable': ['*'],
+        }
+    }),
+    ("^Workstation$", {
+        "x86_64": {
+            "source_repo_from": "Everything",
+            "release": None,
+            "installpkgs": ["fedora-productimg-workstation"],
+            "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
+            "add_template_var": [
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/26/x86_64/workstation",
+            ],
+            "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
+            "add_arch_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/26/",
+                "ostree_osname=fedora-workstation",
+                "ostree_ref=fedora/26/x86_64/workstation",
+            ],
+            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+            'template_branch': 'f26',
+            'failable': ['*'],
+        }
+    })
+]
+
+koji_profile = 'compose_koji'
--- a/fedora.conf
+++ b/fedora.conf
@ -1,12 +1,12 @@
 # PRODUCT INFO
 release_name = 'Fedora'
 release_short = 'Fedora'
-release_version = 'Rawhide'
+release_version = '26'
 release_is_layered = False

 # GENERAL SETTINGS
 bootable = True
-comps_file = 'comps-rawhide.xml' #{
+comps_file = 'comps-f26.xml' #{
 #    'scm': 'git',
 #    'repo': 'https://pagure.io/fedora-comps.git',
 #    'branch': None, # defaults to cvs/HEAD or git/master
@ -79,7 +79,7 @@ lorax_options = [
  ('^.*$', {
     'x86_64': {
         'nomacboot': False
-     }
+     },
     '*': {
         'noupgrade': True
     }
@ -264,9 +264,9 @@ translate_paths = [
 ]

 # These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26'
 global_release = None
-global_version = 'Rawhide'
+global_version = '26'
 # live_images ignores this in favor of live_target
 global_target = 'f26'

@ -274,49 +274,73 @@ image_build = {
    '^Docker$': [
        {
            'image-build': {
-                    'format': [('docker', 'tar.xz')]
+                    'format': [('docker', 'tar.xz')],
                    'name': 'Fedora-Docker-Base',
                    'kickstart': 'fedora-docker-base.ks',
                    'distro': 'Fedora-22',
-                    'disk_size': 3,
-                    'arches': ['x86_64', 'armhfp'],
-                    'repo_from': 'Cloud',
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Docker_Base'
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Docker_Base',
                    'failable': ['*'],
                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26docker", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
+        },
+        {
            'image-build': {
-                    'format': [('docker', 'tar.xz')]
+                    'format': [('docker', 'tar.xz')],
                    'name': 'Fedora-Container-Minimal-Base',
                    'kickstart': 'fedora-docker-base-minimal.ks',
                    'distro': 'Fedora-22',
-                    'disk_size': 3,
-                    'arches': ['x86_64', 'armhfp'],
-                    'repo_from': 'Cloud',
-                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Container_Minimal_Base'
+                    'disk_size': 5,
+                    'arches': ['armhfp', 'aarch64', 'x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Container_Minimal_Base',
                    'failable': ['*'],
-                    }
+                    },
+            'factory-parameters': {
+                'dockerversion': "1.10.1",
+                'docker_cmd':  '[ "/usr/bin/bash" ]',
+                'docker_env': '[ "DISTTAG=f26docker", "FGC=f26" ]',
+                'docker_labels': {
+                    'Name': 'fedora-minimal',
+                    'License': u'MIT',
+                    'Vendor': 'Fedora Project',
+                    'Version': '26',
+                },
+            },
        }
        ],
    '^CloudImages$': [
        {
            'image-build': {
-                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                    'name': 'Fedora-Cloud-Base',
                    'kickstart': 'fedora-cloud-base.ks',
                    'distro': 'Fedora-22',
                    'disk_size': 4,
-                    'arches': ['x86_64'],
+                    'arches': ['aarch64', 'x86_64'],
                    'repo_from': 'Cloud',
                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Cloud_Base'
+                    'subvariant': 'Cloud_Base',
                    'failable': ['*'],
                     }
        },
        {
            'image-build': {
-                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
                    'name': 'Fedora-Cloud-Base-Vagrant',
                    'kickstart': 'fedora-cloud-base-vagrant.ks',
                    'distro': 'Fedora-22',
@ -326,14 +350,14 @@ image_build = {
                    'install_tree_from': 'Cloud',
                    'subvariant': 'Cloud_Base',
                    'failable': ['*'],
-                     }
+                     },
            'factory-parameters': {
                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
            }
        },
        {
            'image-build': {
-                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
+                    'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
                    'name': 'Fedora-Atomic',
                    'kickstart': 'fedora-atomic.ks',
                    'distro': 'Fedora-22',
@ -341,13 +365,13 @@ image_build = {
                    'arches': ['x86_64'],
                    'repo_from': 'Cloud',
                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'subvariant': 'Atomic',
                    'failable': ['*'],
                     }
        },
        {
            'image-build': {
-                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
                    'name': 'Fedora-Atomic-Vagrant',
                    'kickstart': 'fedora-atomic-vagrant.ks',
                    'distro': 'Fedora-22',
@ -355,9 +379,28 @@ image_build = {
                    'arches': ['x86_64'],
                    'repo_from': 'Cloud',
                    'install_tree_from': 'Cloud',
-                    'subvariant': 'Atomic'
+                    'subvariant': 'Atomic',
                    'failable': ['*'],
-                     }
+                     },
+            'factory-parameters': {
+                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
+            }
+        },
+        ],
+    '^Labs$': [
+        {
+            'image-build': {
+                    'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
+                    'name': 'Fedora-Python-Classroom-Vagrant',
+                    'kickstart': 'fedora-python-classroom-vagrant.ks',
+                    'distro': 'Fedora-22',
+                    'disk_size': 40,
+                    'arches': ['x86_64'],
+                    'repo_from': 'Everything',
+                    'install_tree_from': 'Everything',
+                    'subvariant': 'Python_Classroom',
+                    'failable': ['*'],
+                     },
            'factory-parameters': {
                    'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
            }
@ -506,6 +549,15 @@ live_media = {
                'repo_from': 'Everything',
                'install_tree_from': 'Everything',
                'subvariant': 'Robotics'
+            },
+            {
+                'name': 'Fedora-Python-Classroom-Live',
+                'kickstart': 'fedora-live-python-classroom.ks',
+                'arches': ['x86_64', 'i386'],
+                'failable': ['*'],
+                'repo_from': 'Everything',
+                'install_tree_from': 'Everything',
+                'subvariant': 'Python_Classroom'
            }
    ],
 }
@ -597,6 +649,16 @@ live_images = [
                'failable': True,
                },]
    }),
+    ('^Labs$', {
+        'armhfp': {
+                'kickstart': 'fedora-arm-python-classroom.ks',
+                'name': 'Fedora-Python-Classroom-armhfp',
+                'repo_from': 'Everything',
+                'type': 'appliance',
+                'subvariant': 'Python_Classroom',
+                'failable': True,
+                }
+    }),
 ]

 ostree = [
@ -604,15 +666,17 @@ ostree = [
        "aarch64": {
            "treefile": "fedora-atomic-docker-host.json",
            "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f26",
            "source_repo_from": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/atomic/26/",
            'failable': ['*'],
        },
        "x86_64": {
            "treefile": "fedora-atomic-docker-host.json",
            "config_url": "https://pagure.io/fedora-atomic.git",
+            "config_branch": "f26",
            "source_repo_from": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/atomic/26/",
            'failable': ['*'],
        }
    }),
@ -620,8 +684,9 @@ ostree = [
        "x86_64": {
            "treefile": "fedora-ostree-workstation.json",
            "config_url": "https://pagure.io/workstation-ostree-config.git",
+            "config_branch": "f26",
            "source_repo_from": "Workstation",
-            "ostree_repo": "/mnt/koji/compose/ostree/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/ostree/26/",
            'failable': ['*'],
        }
    })
@ -632,20 +697,17 @@ ostree_installer = [
        "x86_64": {
            "source_repo_from": "Everything",
            "release": None,
+            "rootfs_size": "3",
            "installpkgs": ["fedora-productimg-atomic"],
-            "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
+            "add_template": ["atomic-installer/lorax-configure-repo.tmpl",
+                             "atomic-installer/lorax-embed-repo.tmpl"],
            "add_template_var": [
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/26/",
                "ostree_osname=fedora-atomic",
-                "ostree_ref=fedora/rawhide/x86_64/atomic-host",
+                "ostree_ref=fedora/26/x86_64/atomic-host",
            ],
-            "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
-            "add_arch_template_var": [
-                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
-                "ostree_osname=fedora-atomic",
-                "ostree_ref=fedora/rawhide/x86_64/atomic-host",
-            ]
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f26',
            'failable': ['*'],
        }
    }),
@ -657,16 +719,16 @@ ostree_installer = [
            "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
            "add_template_var": [
                "ostree_osname=fedora-workstation",
-                "ostree_ref=fedora/rawhide/x86_64/workstation",
+                "ostree_ref=fedora/26/x86_64/workstation",
            ],
            "add_arch_template": ["workstation-ostree-installer/lorax-embed-repo.tmpl"],
            "add_arch_template_var": [
-                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",
+                "ostree_repo=https://kojipkgs.fedoraproject.org/compose/ostree/26/",
                "ostree_osname=fedora-workstation",
-                "ostree_ref=fedora/rawhide/x86_64/workstation",
-            ]
+                "ostree_ref=fedora/26/x86_64/workstation",
+            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f26',
            'failable': ['*'],
        }
    })
--- a/nightly.sh
+++ b/nightly.sh
@ -1,31 +1,49 @@
 #!/bin/sh

+#set -x

 export LC_ALL=C

+ARCH=$1
 CONFIG="fedora.conf"
-TARGET_DIR="/mnt/koji/compose/rawhide"
+[ -n "$ARCH" ] && {
+CONFIG="fedora-$ARCH.conf"
+SPAMOPTS="--nomail"
+}
+TARGET_DIR="/mnt/koji/compose/branched"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY="--nightly"
 SKIP_PHASES="--skip-phase=productimg"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
-DIST="rawhide"
-BRANCHED="rawhide"
-BRANCH="rawhide"
-COMPSFILE="comps-rawhide.xml"
-GIT_BRANCH="master"
+DIST="26"
+BRANCHED="26"
+BRANCH="branched"
+COMPSFILE="comps-f26.xml"
+GIT_BRANCH="f26"
 TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
-TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
-FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
+TOMAIL="$ARCH@lists.fedoraproject.org"
+FROM="Fedora Branched $ARCH Report <rawhide@fedoraproject.org>"
 RSYNCPREFIX="sudo -u ftpsync"
 ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
 ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
 ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"
-OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID)
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"

+if [ "$ARCH" = "arm" ]; then
+   arches="aarch64"
+   variants="Everything Server Cloud CloudImages Docker"
+elif [ "$ARCH" = "ppc" ]; then
+   arches="ppc64 ppc64le"
+   variants="Everything Server Cloud CloudImages Docker"
+elif [ "$ARCH" = "s390" ]; then
+   arches="s390x"
+   variants="Everything Server"
+   TOMAIL="s390x@lists.fedoraproject.org"
+fi
+
 # assume a releng dir is a git checkout of the releng repo
 # if it does not exist clone it
 if [ -d releng ]; then
@ -53,7 +71,9 @@ git clone https://pagure.io/fedora-comps.git && {
 }
 popd

+[ -z "$ARCH" ] && {
 ./releng/scripts/block_retired.py
+}

 CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"

@ -68,7 +88,7 @@ if [ "$?" != "0" ]; then
    exit 1
 fi

-NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Rawhide/COMPOSE_ID)
+NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)
 SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
 fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
 fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
@ -77,54 +97,24 @@ fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compos
 DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID

 compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
-/usr/share/mash/spam-o-matic $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck
+/usr/share/mash/spam-o-matic $SPAMOPTS $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck

 [ -z "$ARCH" ] && {
 ./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
 }

-ostree prune --repo=$ATOMICREPO --keep-younger-than="14 days ago" --refs-only
-
 # Tell interested persons that the rsync is starting (zomg!)
 send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start

-# Sync the content to /pub/fedora
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora/linux/development/$DIST/ \
-    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
-    --link-dest=/pub/fedora/linux/development/$DIST/Everything --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora/linux/development/$DIST/ \
-    --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
-    --link-dest=/pub/fedora/linux/development/$DIST/Everything --delete-after
-$RSYNCPREFIX rm /pub/fedora/linux/development/$DIST/.composeinfo
-$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora/linux/development/$DIST/ --name "$NEWCOMPOSE_ID"
+for a in $arches
+  do
+  for dir in $variants;
+    do
+      $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/$a/ /pub/fedora-secondary/development/$DIST/$dir/$a/ --link-dest=/pub/fedora-secondary/development/$DIST/Everything/ --exclude=repodata ;
+      $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/$a/ /pub/fedora-secondary/development/$DIST/$dir/$a/ --link-dest=/pub/fedora-secondary/development/$DIST/Everything/ --delete-after ;
+    done
+  done

-# Sync the content to /pub/alt
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$DIST/ \
-    --variant Cloud --variant Labs \
-    --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$DIST/ \
-    --variant Cloud --variant Labs \
-    --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after
-$RSYNCPREFIX rm /pub/alt/development/$DIST/.composeinfo
-$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/development/$DIST/ --name "$NEWCOMPOSE_ID"
-
-# Sync the content to /pub/fedora-secondary
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$DIST/ \
-    --exclude=s390x \
-    --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata
-$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le \
-    "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$DIST/ \
-    --exclude=s390x \
-    --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after
-$RSYNCPREFIX rm /pub/alt/development/$DIST/.composeinfo
-$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/development/$DIST/ --name "$NEWCOMPOSE_ID"
-
-$RSYNCPREFIX rsync -avhH --delete-after $ATOMICREPO $ATOMICDEST

 # Tell interested persons that the rsync is done.
 send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
@ -146,10 +136,13 @@ do
  elif [ "$koji" = "ppc" ]; then
     arches=ppc64,ppc64le
  elif [ "$koji" = "s390" ]; then
-     arches=s390,s390x
+     arches=s390x
  fi
-  ./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/Packages/\*/ >$DESTDIR/logs/excludearch-$koji.log
+  ./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/Packages/ >$DESTDIR/logs/excludearch-$koji.log
 done

+# lock needs to be on NFS as we run it from different compose boxes for each secondary arch
+/usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora-secondary
+
 find $TARGET_DIR  -xdev -depth -maxdepth 2 -mtime +14  -exec rm -rf {} \;

--- a/release-candidate.sh
+++ b/release-candidate.sh
@ -1,7 +1,7 @@
 #!/bin/sh
 export LC_ALL=C
 LABEL=$1
-CONFIG="fedora-final.conf"
+CONFIG="fedora-alpha.conf"
 TARGET_DIR="/mnt/koji/compose/26"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY=""
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@ -38,6 +38,7 @@
    </variant>
    <variant id="Labs" name="Labs" type="variant" is_empty="true">
        <arches>
+            <arch>armhfp</arch>
            <arch>i386</arch>
            <arch>x86_64</arch>
        </arches>
Author	SHA1	Message	Date
Peter Robinson	dc29d37011	update nightly for f26 secondary (s390x) Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2017-04-13 17:11:31 +01:00
Peter Robinson	062a872cce	update for s390x branched Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2017-04-12 10:12:43 +01:00
Ralph Bean	49d1f6c456	Typofix. Signed-off-by: Ralph Bean <rbean@redhat.com>	2017-04-05 13:28:17 -04:00
Mohan Boddu	a824751c28	Fix for alternative arch composeinfo This fixes the generation of .composeinfo file for alternative arches. Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-04-03 17:24:33 -04:00
Mohan Boddu	ed8450daf7	Adding armhfp arch to Labs variant Fix for #6737 python-classroom is the first armhfp image under Labs variant. And, the compose has been failing since its missing from variants.xml file. This will fix it. Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-31 15:50:54 -04:00
Adam Miller	267f32f779	Fix docker metadata formatting and license The previous formatting for docker image metadata was getting escaped incorrectly when passed to imagefactory. This resolves that. Fix the license label to be MIT instead of GPLv2. Fix the bash path Remove atomic RUN command, it causes build failures and isn't necessary in the base image. Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2017-03-31 13:52:39 -05:00
Adam Miller	0da396ba64	Add dockerversion to factory-parameters Currently, imagefactory's docker plugin will default an older version of the metadata imager format that is not compatible with the latest versions of docker. This change tells the plugin to use the docker version "1.10.1" metadata format which is compatible with all currently available docker releases. Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2017-03-30 12:23:24 -05:00
Robert Marshall	03eb5280dd	Bump global_release for Fedora 26 Alpha RC7 The latest Fedora 26 Alpha compose is now release candidate 7. Signed-off-by: Robert Marshall <rmarshall@redhat.com>	2017-03-29 10:02:13 -04:00
Mohan Boddu	af8ccdeb09	Bump global_release for Fedora 26 Alpha RC6 Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-28 21:15:26 -04:00
Adam Miller	00a5c4c7cb	Add docker base image metadata Currently we don't produce a docker base image that can be used with OSBS or via the 'atomic run' command without modification. This fixes that and will allow for an automated import of the base images into the Fedora Container Registry Also, fix various missing commas in dict declarations Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2017-03-28 16:34:54 -05:00
Mohan Boddu	d914cd47e5	Bump global_release for Fedora 26 Alpha RC5 Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-28 10:35:24 -04:00
Mohan Boddu	8ea729fbb8	Bumping global_release version for 26_Alpha-1.4 Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-28 01:33:12 -04:00
Robert Marshall	34d9e8732c	Bump global_release for Fedora 26 Alpha RC3 The latest Fedora 26 Alpha compose is now release candidate 3. Signed-off-by: Robert Marshall <rmarshall@redhat.com>	2017-03-27 14:13:31 -04:00
Peter Robinson	9048234f26	add aarch64 to Cloud/Docker images to alpha config. There was an issue with Pagure merge so they were missed. This will ensure we get them if there's a new alpha and that the config ends up in beta configs if note Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2017-03-22 15:57:38 +00:00
Peter Robinson	6f79201f75	Enable aarch64 cloud and docker images This enables the creation of the aarch64 cloud and docker images as part of the nightly compose Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2017-03-22 10:48:18 -05:00
Mohan Boddu	5e3ec7b7fe	Bumping global_release version for 26_Alpha-1.2 Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-21 15:55:46 -04:00
Mohan Boddu	47a4d74957	Setup for Fedora 26 Alpha Adding fedora-alpha.conf and changing the release-candidate.sh to use fedora-alpha.conf Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-16 09:32:08 -05:00
Dusty Mabe	ce4cdf5202	atomic installer: move from arch-template to template Otherwise I don't get access to the "root" variable we are trying to use here [1]. [1] https://pagure.io/fedora-lorax-templates/pull-request/16#_2,7 Signed-off-by: Dusty Mabe <dusty@dustymabe.com>	2017-03-14 18:09:39 -04:00
Dusty Mabe	cdb2a396a3	atomic: increase rootfs size for lorax runs switching to the new model where we store the ostree repo in the root of the ISOs fs means it is a littler larger. Signed-off-by: Dusty Mabe <dusty@dustymabe.com>	2017-03-14 17:39:22 -04:00
Dusty Mabe	7ceb13fd7d	update pungi configs for fedora 26 atomic Signed-off-by: Dusty Mabe <dusty@dustymabe.com>	2017-03-14 17:31:32 -04:00
Dennis Gilmore	ad186f5453	use Everything for docker and make disk size bigger minimal container image says it needs more disk space so bump size to 5G use the Everything repo for the container images, microdnf is not part of the cloud variant and it really does not make ense to add it nor to make a container Variant with its own install tree Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2017-03-10 17:35:09 -06:00
Dennis Gilmore	5eea17eb54	add missing },{ so we get docker base back There was a missing },{ between the two container images. The end result is that pungi validates the config but only finds the last section so only makes one of the two images Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2017-03-10 17:32:47 -06:00
Mohan Boddu	f6bd5463d8	Switch python-classroom vagrant to Everything repo As the Cloud tree does not contain the python-classroom comps group, and the Lab is a Lab and not part of the Cloud variant we will use the Everything install tree the same as all the other Labs. Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-10 14:42:08 -06:00
Dan Horák	a73f1f3f81	nightly.sh: update arches for s390 koji Signed-off-by: Dan Horák <dan@danny.cz>	2017-03-09 18:52:51 +01:00
Dan Horák	bfa3a7c6e6	nightly.sh: update for updated srpm-excluded-arch.py Signed-off-by: Dan Horák <dan@danny.cz>	2017-03-09 18:52:51 +01:00
Mohan Boddu	ec036afbd7	Disable i386 for python-classroom vagrant image Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-07 16:32:59 -05:00
Dennis Gilmore	1a8b28e30a	the comps file has f26 in it Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2017-03-01 16:26:35 -06:00
Mohan Boddu	fd1e83b26a	Adding Python Classroom Lab to Fedora 26 Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-03-01 14:33:16 -05:00
Mohan Boddu	47103ea6b3	Branching f26 from rawhide Signed-off-by: Mohan Boddu <mboddu@redhat.com>	2017-02-27 18:30:35 -05:00