PR#530: Enable Atomic, Cloud and Container composes on s390x in f28 - pungi-fedora

pungi-fedora

#530 Enable Atomic, Cloud and Container composes on s390x in f28

Merged 6 years ago by ausil. Opened 6 years ago by sinnykumari.

sinnykumari/pungi-fedora f28 into f28

Enable Atomic, Cloud and Container composes on s390x in f28

Sinny Kumari • 6 years ago

b18a87c

fedora.conf

file modified

+31 -5

		`@@ -285,7 +285,7 @@`
		`'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',`
		`@@ -305,7 +305,7 @@`
		`'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',`
		`@@ -327,11 +327,11 @@`
		`'kickstart': 'fedora-cloud-base.ks',`
		`'distro': 'Fedora-22',`
		`'disk_size': 4,`
		`- 'arches': ['aarch64', 'ppc64', 'ppc64le', 'x86_64'],`
		`+ 'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],`
		`'repo': 'Cloud',`
		`'install_tree_from': 'Cloud',`
		`'subvariant': 'Cloud_Base',`
		`- 'failable': ['aarch64', 'ppc64', 'ppc64le'],`
		`+ 'failable': ['aarch64', 'ppc64', 'ppc64le', 's390x'],`
		`}`
		`},`
		`{`
		`@@ -355,7 +355,7 @@`
		`'kickstart': 'fedora-atomic.ks',`
		`'distro': 'Fedora-22',`
		`'disk_size': 6,`
		`- 'arches': ['aarch64', 'ppc64le', 'x86_64'],`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'install_tree_from': 'Cloud',`
		`'subvariant': 'Atomic',`
		`'failable': ['*'],`
		`@@ -735,6 +735,15 @@`
		`"repo": "Everything",`
		`"ostree_repo": "/mnt/koji/compose/atomic/28/",`
		`'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": "f28",`
		`+ "repo": "Everything",`
		`+ "ostree_repo": "/mnt/koji/compose/atomic/28/",`
		`+ 'failable': ['*'],`
		`}`
		`}),`
		`("^ostree$", {`
		`@@ -802,6 +811,23 @@`
		`'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`'template_branch': 'f28',`
		`'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/28/",`
		`+ "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/28/",`
		`+ "ostree_osname=fedora-atomic",`
		`+ "ostree_install_ref=fedora/28/s390x/atomic-host",`
		`+ "ostree_update_ref=fedora/28/s390x/atomic-host",`
		`+ ],`
		`+ 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`+ 'template_branch': 'f28',`
		`+ 'failable': ['*'],`
		`}`
		`}),`
		`("^WorkstationOstree$", {`

variants-fedora.xml

file modified

		`@@ -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>`
		`@@ -144,6 +147,7 @@`
		`<arch>i386</arch>`
		`<arch>ppc64</arch>`
		`<arch>ppc64le</arch>`
		`+ <arch>s390x</arch>`
		`<arch>x86_64</arch>`
		`</arches>`
		`<groups>`