Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/kvm-x-fips into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

We will need to install the openssh-client-hmac for this test after
enabling the fipsdevppa support in our infrastructure code.

Otherwise it will fail with:
    fips: mandatory checksum data missing - aborting

It appears this package is only available in X and B.

[Magali Lemes do Sacramento (magalilemes)]

LGTM!
(Assuming the successful build #4 for 4.4.0-1100.107 on the rizzo node for this test has this patch applied).
Thank youuuu!

review: Approve

[Po-Hsu Lin (cypressyew)]

Yes that's correct, I forgot to mention this :D
Applied and pushed.
Thanks!

diff --git a/ubuntu_kvm_smoke_test/ubuntu_kvm_smoke_test.py b/ubuntu_kvm_smoke_test/ubuntu_kvm_smoke_test.py
index 0a89146..bbf3bbc 100644
--- a/ubuntu_kvm_smoke_test/ubuntu_kvm_smoke_test.py
+++ b/ubuntu_kvm_smoke_test/ubuntu_kvm_smoke_test.py
@@ -2,6 +2,7 @@
 #
 import os
 import platform
+import re
 from autotest.client                        import test, utils
 
 class ubuntu_kvm_smoke_test(test.test):
@@ -14,6 +15,7 @@ class ubuntu_kvm_smoke_test(test.test):
         except AttributeError:
             import distro
             series = distro.codename()
+        flavour = re.split('-\d*-', platform.uname()[2])[-1]
         pkgs = [
             'cpu-checker',
             'uvtool',
@@ -23,6 +25,9 @@ class ubuntu_kvm_smoke_test(test.test):
         # available since Artful
         if arch == 'aarch64' and series not in ['trusty', 'xenial']:
             pkgs.append('qemu-efi-aarch64')
+        if 'fips' in flavour and series in ['xenial', 'bionic']:
+            # Ensure openssh-client-hmac is installed for fips kernel, this is available on X/B only LP: #2061365
+            pkgs.append('openssh-client-hmac')
 
         cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
         self.results = utils.system_output(cmd, retain_output=True)