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

[Paride Legovini]

Implement the changes needed to build UTAH on s390x, plus several improvements to the packaging in general.

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

1134. By Joshua Powers on 2019-03-21

* 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)
* Fix syntax errors in d/changelog

=== modified file 'debian/changelog'
--- debian/changelog	2018-01-03 18:57:10 +0000
+++ debian/changelog	2019-03-21 12:00:34 +0000
@@ -1,3 +1,14 @@
+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) 
+  * Fix syntax errors in d/changelog
+
+ -- Paride Legovini <[e-mail]>  Wed, 06 Mar 2019 13:51:19 +0100
+
 utah (0.18) UNRELEASED; urgency=medium
 
   * Releasing new version schema to allow ppa recipes will include date in
@@ -328,6 +339,7 @@
 utah (0.12.4ubuntu1) raring; urgency=low
 
   * Fix reboot support in runlists (LP: #1179531)
+
 utah (0.12.3ubuntu2) raring; urgency=low
 
   * Check sftp_client is initialized before closing it (LP: #1178686)

=== modified file 'debian/control'
--- debian/control	2016-12-23 15:16:59 +0000
+++ debian/control	2019-03-21 12:00:34 +0000
@@ -16,9 +16,9 @@
          bsdtar, libvirt-bin, lzma,
          python-apt, python-jinja2, python-libvirt,
          python-netifaces, python-paramiko, python-psutil,
-         sbsigntool [!ppc64el],
+         sbsigntool [!ppc64el !s390x],
          utah-client (=${binary:Version})
-Recommends: dl-ubuntu-test-iso | ubuntu-qa-tools, kvm
+Recommends: dl-ubuntu-test-iso | ubuntu-qa-tools, make
 Description: Ubuntu Test Automation Harness
  Automation framework for testing in Ubuntu
 

=== modified file 'debian/source/format'
--- debian/source/format	2012-04-23 14:13:00 +0000
+++ debian/source/format	2019-03-21 12:00:34 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)

=== modified file 'debian/utah.postinst'
--- debian/utah.postinst	2013-06-05 02:00:56 +0000
+++ debian/utah.postinst	2019-03-21 12:00:34 +0000
@@ -56,7 +56,7 @@
       [ -z "$SERVER_USER" ] && SERVER_USER=utah
       [ -z "$SERVER_NAME" ] && SERVER_NAME="UTAH"
       [ -z "$SERVER_GROUP" ] && SERVER_GROUP=utah
-      [ -z "$SERVER_GROUPS" ] && SERVER_GROUPS="libvirtd,kvm"
+      [ -z "$SERVER_GROUPS" ] && SERVER_GROUPS="libvirt,kvm"
       [ -z "$SSH_DIR" ] && SSH_DIR=~utah/.ssh
 
       if ! getent group | grep -q "^$SERVER_GROUP:"

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2018-08-22 15:48:08 +0000
+++ utah/provisioning/provisioning.py	2019-03-21 12:00:34 +0000
@@ -678,7 +678,7 @@
             self.initrd_no_extension = True
         else:
             raise UTAHProvisioningException(
-                'initrd file does have have gz or lz extension or no extension: {}'.format(initrd))
+                'initrd file does not have gz or lz extension or no extension: {}'.format(initrd))
         if exitstatus != 0:
             # Currently this comes up as 512 when things seem fine
             # TODO: refactor this and check for codes at all stages