Merge lp:~paride/utah/ppc64el-s390x-subiquity into lp:utah

[Paride Legovini]

Enable live-server testing on s390x and ppc64el.

 * Various fixes for live-server testing on ppc64 and s390x
 * Add workaround for LP: #1822096.
 * live-server testing:
   - Use a newer way of specifying the public key that will be used to log in
   - Add a way to force a subiquity refresh to a specific channel via the
     command line.

=== modified file 'conf/utah/default-vm-s390x.xml'
--- conf/utah/default-vm-s390x.xml	2019-03-25 12:22:16 +0000
+++ conf/utah/default-vm-s390x.xml	2019-04-17 14:44:32 +0000
@@ -25,6 +25,7 @@
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+    <boot dev='hd'/>
   </os>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
@@ -36,6 +37,13 @@
       <mac address='00:00:00:00:00:00'/>
       <source network='default'/>
       <model type='virtio'/>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
     </interface>
-  </devices>
+   <disk type='file' device='cdrom'>
+    <driver name='qemu' type='raw'/>
+    <backingStore/>
+    <target dev='sdc' bus='scsi'/>
+    <readonly/>
+  </disk>
+ </devices>
 </domain>

=== modified file 'debian/changelog'
--- debian/changelog	2019-03-26 13:57:32 +0000
+++ debian/changelog	2019-04-17 14:44:32 +0000
@@ -1,3 +1,13 @@
+utah (0.19~bzr201904171433) UNRELEASED; urgency=medium
+  * Various fixes for live-server testing on ppc64 and s390x
+  * Add workaround for LP: #1822096.
+  * live-server testing:
+    - Use a newer way of specifying the public key that will be used to log in
+    - Add a way to force a subiquity refresh to a specific channel via the
+      command line.
+
+ -- Paride Legovini <[e-mail]>  Wed, 17 Apr 2019 16:34:51 +0200
+
 utah (0.19~bzr201903261308) UNRELEASED; urgency=medium
   * ISO static validation support for s390x
   * d/changelog provisional version string: date --utc '+%Y%m%d%H%M'

=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2019-04-03 18:18:58 +0000
+++ utah/isotest/iso_static_validation.py	2019-04-17 14:44:32 +0000
@@ -386,7 +386,7 @@
         if self.st_arch == 'ppc64el':
             files_list = open(os.path.join(DATA_PATH,
                               'file_list_subiquity_powerpc'))
-        if self.st_arch == 's390x':
+        elif self.st_arch == 's390x':
             files_list = open(os.path.join(DATA_PATH,
                               'file_list_subiquity_s390x'))
         else:

=== modified file 'utah/provisioning/live_server.py'
--- utah/provisioning/live_server.py	2019-04-12 04:02:44 +0000
+++ utah/provisioning/live_server.py	2019-04-17 14:44:32 +0000
@@ -117,6 +117,7 @@
         with open(config.sshpublickey) as fp:
             keydata = fp.read()
         answers["SSH"] = {
+            'install': True, # workaround for LP: #1825165
             'install_server': True,
             'authorized_keys': [keydata],
             }
@@ -270,7 +271,7 @@
             target.set('port', '0')
             console.append(target)
             devices.append(console)
-        else:
+        elif self.image.arch != 'ppc64el':
             serial = ElementTree.Element('serial')
             serial.set('type', 'file')
             source = ElementTree.Element('source')
@@ -334,6 +335,10 @@
             except libvirt.libvirtError:
                 pass
             finally:
+                # Workaround for LP: #1822096
+                # To be removed once fixed in libvirtd.
+                time.sleep(5)
+
                 vm.undefine()
 
         after = time.time()
@@ -352,7 +357,11 @@
         devices = xml.find('devices')
         for disk in list(devices.iterfind('disk')):
             if disk.get('device') == 'cdrom':
-                disk.remove(disk.find('source'))
+                if disk.find('target').get('bus') == 'virtio':
+                   devices.remove(disk)
+                else:
+                   disk.remove(disk.find('source'))
+                continue
             source = disk.find('source')
             if source is not None and source.get('file') == self.answers_image_path:
                 devices.remove(disk)