Merge lp:~paride/utah/packaging-fixes into lp:utah

[Paride Legovini]

More changes to support s390x:
  * Look for the kernel in boot/kernel.ubuntu on s390x
  * Add an XML file for s390x
  * Support for the s390x sclp console
  * Detect if the initrd is a gzip using the gz magic numbers

[lp:~paride/utah/packaging-fixes]

1136. By Joshua Powers on 2019-03-25

* Look for the kernel in boot/kernel.ubuntu on s390x
* Add an XML file for s390x
* Support for the s390x sclp console
* Detect if the initrd is a gzip using the gz magic numbers
* utah-latecommand: do not assume /dev/ttyS0 exists
* latecommand-wrapper: run with 'set -e'
* utah.postinst: replace 'libvirtd' group with 'libvirt' (LP: #1818670)

=== added file 'conf/utah/default-vm-s390x.xml'
--- conf/utah/default-vm-s390x.xml	1970-01-01 00:00:00 +0000
+++ conf/utah/default-vm-s390x.xml	2019-03-25 14:51:08 +0000
@@ -0,0 +1,41 @@
+<!--
+  Copyright (C) 2019, Canonical Ltd (http://www.canonical.com/)
+
+  This file is part of utah.
+
+  utah is free software: you can redistribute it
+  and/or modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation, either version 3 of
+  the License, or (at your option) any later version.
+
+  utah is distributed in the hope that it will
+  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with ubuntu-server-iso-testing.  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+<domain type='kvm'>
+  <name>Utah Example</name>
+  <uuid>00000000-0000-0000-0000-000000000000</uuid>
+  <memory>1048576</memory>
+  <currentMemory>1048576</currentMemory>
+  <vcpu placement='static'>2</vcpu>
+  <os>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash><!-- this could also be 'preserve' -->
+  <devices>
+  <emulator>/usr/bin/kvm</emulator>
+    <interface type='network'>
+      <mac address='00:00:00:00:00:00'/>
+      <source network='default'/>
+      <model type='virtio'/>
+    </interface>
+  </devices>
+</domain>
 
=== modified file 'debian/changelog'
--- debian/changelog	2019-03-06 13:41:11 +0000
+++ debian/changelog	2019-03-25 14:51:08 +0000
@@ -1,10 +1,20 @@
+utah (0.19~bzr1143) UNRELEASED; urgency=medium
+  * Look for the kernel in boot/kernel.ubuntu on s390x
+  * Add an XML file for s390x
+  * Support for the s390x sclp console
+  * Detect if the initrd is a gzip using the gz magic numbers
+  * utah-latecommand: do not assume /dev/ttyS0 exists
+  * latecommand-wrapper: run with 'set -e'
+
+ -- Paride Legovini <[e-mail]>  Mon, 25 Mar 2019 15:48:38 +0100
+
 utah (0.19~bzr1138) UNRELEASED; urgency=medium
 
   * Set source format: 3.0 (native)
   * Remove secureboot dependency for s390x
   * Don't Recommend nonexisting kvm package
   * Make 'utah' (bin pkg) Recommend 'make' (LP: #1818686)
-  * utah.postinst: replace 'libvirtd' group with 'libvirt' (LP: #1818670) 
+  * utah.postinst: replace 'libvirtd' group with 'libvirt' (LP: #1818670)
   * Fix syntax errors in d/changelog
 
  -- Paride Legovini <[e-mail]>  Wed, 06 Mar 2019 13:51:19 +0100
 
=== modified file 'utah/iso.py'
--- utah/iso.py	2018-04-25 18:27:09 +0000
+++ utah/iso.py	2019-03-25 14:51:08 +0000
@@ -453,6 +453,8 @@
         kernelpath = './install/vmlinuz'
         if self.arch == 'ppc64el':
             kernelpath = './install/vmlinux'
+        if self.arch == 's390x':
+            kernelpath = './boot/kernel.ubuntu'
         elif self.installtype == 'mini':
             self.logger.debug('Getting kernel for mini image')
             kernelpath = 'linux'
 
=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2019-03-12 12:44:12 +0000
+++ utah/provisioning/provisioning.py	2019-03-25 14:51:08 +0000
@@ -18,6 +18,7 @@
 Functions here should apply to multiple machine types (VM, bare metal, etc.)
 """
 
+import binascii
 import logging
 import logging.handlers
 import os
@@ -624,7 +625,9 @@
         if initrd is None:
             self.logger.info('Unpacking initrd from image')
             initrdpath = './install/initrd.gz'
-            if self.image.installtype == 'mini':
+            if self.image.arch == 's390x':
+                initrdpath = './boot/initrd.ubuntu'
+            elif self.image.installtype == 'mini':
                 self.logger.debug('Mini image detected')
                 initrdpath = 'initrd.gz'
             elif self.image.installtype == 'desktop':
@@ -658,7 +661,14 @@
             raise UTAHProvisioningException(
                 'Error using temp directory {}: {}'.format(tmpdir, err))
         pipe = pipes.Template()
-        if os.path.splitext(initrd)[1] == '.gz':
+
+        with open(initrd, 'rb') as initrd_f:
+            if binascii.hexlify(initrd_f.read(2)) == b'1f8b':
+                initrd_is_gz = True
+            else:
+                initrd_is_gz = False
+
+        if initrd_is_gz:
             self.logger.debug('Using gzip based on file extension')
             pipe.prepend('zcat $IN', 'f-')
             pipe.append('cpio -ivd 2>/dev/null', '-.')
 
=== modified file 'utah/provisioning/vm.py'
--- utah/provisioning/vm.py	2018-09-10 14:37:51 +0000
+++ utah/provisioning/vm.py	2019-03-25 14:51:08 +0000
@@ -385,17 +385,29 @@
                         mac)
             if interface.get('type') == 'bridge':
                 interface.find('source').set('bridge', config.bridge)
-        serial = ElementTree.Element('serial')
-        serial.set('type', 'file')
-        source = ElementTree.Element('source')
-        source.set('path', self.syslog)
-        #TODO: reintegrate this when the required qemu version lands
-#        source.set('append', 'on')  # lp#1548499
-        serial.append(source)
-        target = ElementTree.Element('target')
-        target.set('port', '0')
-        serial.append(target)
-        devices.append(serial)
+        if self.image.arch == ('s390x'):
+            console = ElementTree.Element('console')
+            console.set('type', 'pty')
+            log = ElementTree.Element('log')
+            log.set('file', self.syslog)
+            log.set('append', 'on')
+            console.append(log)
+            target = ElementTree.Element('target')
+            target.set('type', 'sclp')
+            target.set('port', '0')
+            console.append(target)
+            devices.append(console)
+        else:
+            serial = ElementTree.Element('serial')
+            serial.set('type', 'file')
+            source = ElementTree.Element('source')
+            source.set('path', self.syslog)
+            source.set('append', 'on')
+            serial.append(source)
+            target = ElementTree.Element('target')
+            target.set('port', '0')
+            serial.append(target)
+            devices.append(serial)
 
     def _installvm(self, lv=None, tmpdir=None, xml=None):
         """Install a VM, then undefine it in libvirt.