davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #496 Enable Atomic, Cloud and Docker composes on s390x in rawhide

Browse Source
This commit is contained in:
Dennis Gilmore 2018-02-27 18:23:03 +00:00
commit 48d1f6fc57
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fedora.conf
View File

@ -301,7 +301,7 @@ image_build = {
'kickstart': 'fedora-docker-base.ks',
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64', 's390x'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Container_Base',
@ -321,7 +321,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', 'x86_64', 's390x'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Container_Minimal_Base',
@ -343,11 +343,12 @@ image_build = {
'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-22',
'disk_size': 4,
'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],
'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64', 's390x'],
'repo': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base',
'failable': ['ppc64', 'ppc64le'],
'failable': ['ppc64', 'ppc64le', 's390x'],
}
},
{
@ -371,7 +372,7 @@ image_build = {
'kickstart': 'fedora-atomic.ks',
'distro': 'Fedora-22',
'disk_size': 6,
'arches': ['aarch64', 'ppc64le', 'x86_64'],
'arches': ['aarch64', 'ppc64le', 'x86_64', 's390x'],
'install_tree_from': 'Cloud',
'subvariant': 'Atomic',
'failable': ['*'],
@ -750,6 +751,15 @@ ostree = [
"repo": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
'failable': ['*'],
},
"s390x": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"treefile": "fedora-atomic-host.json",
"config_url": "https://pagure.io/fedora-atomic.git",
"config_branch": "master",
"repo": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
'failable': ['*'],
}
}),
("^ostree$", {
@ -817,6 +827,23 @@ ostree_installer = [
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
'failable': ['*'],
},
"s390x": {
"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/rawhide/",
"ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
"ostree_osname=fedora-atomic",
"ostree_install_ref=fedora/rawhide/s390x/atomic-host",
"ostree_update_ref=fedora/rawhide/s390x/atomic-host",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'master',
'failable': ['*'],
}
}),
("^WorkstationOstree$", {

4
variants-fedora.xml
View File

@ -6,6 +6,7 @@
<arch>aarch64</arch>
<arch>x86_64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
</arches>
</variant>
<variant id="CloudImages" name="CloudImages" type="variant" is_empty="true">
@ -14,6 +15,7 @@
<arch>i386</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
</arches>
</variant>
@ -23,6 +25,7 @@
<arch>armhfp</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
</arches>
</variant>
@ -142,6 +145,7 @@
<arch>aarch64</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
</arches>
<groups>