#496 Enable Atomic, Cloud and Docker composes on s390x in rawhide
Merged 2 years ago by ausil. Opened 2 years ago by sinnykumari.
sinnykumari/pungi-fedora master  into  master

file modified
+32 -5
@@ -289,7 +289,7 @@ 

                      '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',
@@ -309,7 +309,7 @@ 

                      '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',
@@ -331,11 +331,12 @@ 

                      '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'],

+ 

                       }

          },

          {
@@ -359,7 +360,7 @@ 

                      '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': ['*'],
@@ -738,6 +739,15 @@ 

              "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$", {
@@ -805,6 +815,23 @@ 

              '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$", {

file modified
+4
@@ -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>

With Fedora 27, s390x composes (Server and Everything) are
part of primary compose. It will be nice to have atomic, cloud
and docker composes available for s390x too.

Signed-off-by: Sinny Kumari sinny@redhat.com

LGTM - @sinnykumari - can you email the atomic-devel list to raise awareness and also once this is merged and there is a successful first run we should follow up and link to it on the list.

I do not believ we have any hardware capable of running imagefactory for s390x @kevin @puiterwijk can you comment on the hardware situation please?

Well, I am not sure what imagefactory needs.

We have 15 s390x vm's... do they need something special to run imagefactory? nested-virt?

I am not 100% sure whats needed. they do have to be running an os that supports KVM. I suspect we will have to do some investigation to see what is needed.

nested virt works on s390x by design, in the current Fedora infra it would be z/VM guest serving as KVM host


[root@buildvm-s390x-03 ~][PROD]# ls -lah /dev/kvm
crw-------. 1 root root 10, 232 Dec 28 20:44 /dev/kvm

The builders have kvm support, we will have to make sure we have image building enabled on the builders and that we have imagefactory and oz with s390x support installed. Until the infra is setup and tested this can not be merged

Until the infra is setup and tested this can not be merged

Who can do that? Do we need to open a ticket?

Who can do that? Do we need to open a ticket?

It should be as simple as a minor change to the ansible config for the builders (likely adding s390x to a variable/if statement) and doing a ansible run against the affected hosts.

Who can do that? Do we need to open a ticket?

I am not sure that the oz and imagefactory builds availabe have the recently added support for s390x upstream yet, an infrastructure issue should be filled, along with coordination with the package owners to make sure that the needed code is available to be deployed, along with ensuring that the builders ahve the necessary bits, enabled. I think they do. we will then need to work with @releng to ensure that the builders are in the correct channel in koji to ensure that we can do the image builds.

Well, I am not sure what imagefactory needs.
We have 15 s390x vm's... do they need something special to run imagefactory? nested-virt?

To run imagefactory we need 3G of memory(to be exact 3170304 bits), 2 vcpu. Nested virt with KVM support works fine on s390x. I have tested this locally by running virt-install which worked fine. Sadly, it seems imagefactory needs to be patched for supporting s390x. I thought imagefactory supports s390x as well, my bad :/

nested virt works on s390x by design, in the current Fedora infra it would be z/VM guest serving as KVM host

+1

I will work with upstream on adding s390x support in imagefactory and this patch can be revisited after that.

LGTM - @sinnykumari - can you email the atomic-devel list to raise awareness and also once this is merged and there is a successful first run we should follow up and link to it on the list.

That's nice idea! Sent email with update on atomic-devel ML.

Who can do that? Do we need to open a ticket?

I am not sure that the oz and imagefactory builds availabe have the recently added support for s390x upstream yet, an infrastructure issue should be filled, along with coordination with the package owners to make sure that the needed code is available to be deployed, along with ensuring that the builders ahve the necessary bits, enabled. I think they do. we will then need to work with @releng to ensure that the builders are in the correct channel in koji to ensure that we can do the image builds.

I looked into upstream imagefactory and oz source code. I don't see any s390x specific changes there, please correct me if I am wrong.
There are s390x support being added in oz master branch, which is not yet available in latest Fedora package update (oz-0.16.0-1). I have filed a bug for same at https://bugzilla.redhat.com/show_bug.cgi?id=1535043 . With these changes, imagefactory command run looks fine to me.

rebased onto 5084ee7dfe72aa1475b975891059d97ffdbb32ab

2 years ago

rebased onto add1de2

2 years ago

Pull-Request has been merged by ausil

2 years ago
Metadata