From a40522c2edb3e29d1b3c3110f26d2db6cdd3aaed Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Tue, 7 Jul 2015 17:46:00 +0200
Subject: cherry-pick commits 3870 to 3873 from trunk

---
 jobs/suspend.txt.in           | 2 ++
 whitelists/hwsubmit.whitelist | 1 +
 2 files changed, 3 insertions(+)

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 4e10c62..13c92c6 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -807,6 +807,7 @@ estimated_duration: 1.2
 requires:
  device.category == 'WIRELESS'
  environment.ROUTERS == 'multiple'
+ IEEE_80211.ac == 'supported'
 user: root
 environ: WPA_AC_SSID WPA_AC_PSK
 command:
@@ -829,6 +830,7 @@ estimated_duration: 1.2
 requires:
  device.category == 'WIRELESS'
  environment.ROUTERS == 'multiple'
+ IEEE_80211.ac == 'supported'
 user: root
 environ: OPEN_AC_SSID
 command:
diff --git a/whitelists/hwsubmit.whitelist b/whitelists/hwsubmit.whitelist
index 56c4d72..218bd1d 100644
--- a/whitelists/hwsubmit.whitelist
+++ b/whitelists/hwsubmit.whitelist
@@ -11,6 +11,7 @@ package
 uname
 usb
 __info__
+info/buildstamp
 cpuinfo_attachment
 dmesg_attachment
 dmi_attachment
-- 
cgit v1.2.3


From d2d5df70f9fb702767935315508e85cb6d6d83c7 Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Mon, 13 Jul 2015 14:30:02 +0200
Subject: cherry-pick fix for virtualization test

---
 bin/virtualization | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bin/virtualization b/bin/virtualization
index dbd8c9d..f1d043c 100755
--- a/bin/virtualization
+++ b/bin/virtualization
@@ -105,6 +105,15 @@ QEMU_ARCH_CONFIG = {
             '-machine', 'accel=kvm:tcg',
         ],
     },
+    'ppc64el': {
+        'cloudimg_type': CLOUD_IMAGE_TYPE_DISK,
+        'cloudimg_arch': 'ppc64el',
+        'qemu_bin': 'qemu-system-ppc64',
+        'qemu_disk_type': QEMU_DISK_TYPE_VIRTIO,
+        'qemu_extra_args': [
+            '-machine', 'prep',
+        ],
+    },
 }
 
 class QemuRunner(object):
-- 
cgit v1.2.3


From 58f09a36033cbd38dd0fdfe0d5d7f710d84f83b2 Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Mon, 13 Jul 2015 14:31:29 +0200
Subject: cherry-pick new EFI-mode boot test for servers.

---
 jobs/miscellanea.txt.in | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/jobs/miscellanea.txt.in b/jobs/miscellanea.txt.in
index f89e97e..165332c 100644
--- a/jobs/miscellanea.txt.in
+++ b/jobs/miscellanea.txt.in
@@ -70,6 +70,19 @@ command: ipmi_test
 _description:
  This will run some basic connectivity tests against a BMC, verifying that IPMI works.
 
+plugin: shell
+estimated_duration: 0.5
+id: miscellanea/boot_mode
+_summary: EFI-mode boot test
+_description: Succeeds when booted in EFI mode; fails otherwise
+command:
+  if [ -d "/sys/firmware/efi" ] ; then
+    echo "System booted in EFI mode"
+  else
+    echo "System did NOT boot in EFI mode"
+    exit 1
+  fi
+
 plugin: shell
 id: miscellanea/bmc_info
 requires: package.name == 'ipmitool'
-- 
cgit v1.2.3


From 12fcb8c0680cbf730f1155863248e6dad56a3795 Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Mon, 13 Jul 2015 14:33:02 +0200
Subject: providers/plainbox-provider-checkbox: increment version to 0.22.dev

---
 manage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manage.py b/manage.py
index 292a2b3..3a6990b 100755
--- a/manage.py
+++ b/manage.py
@@ -4,7 +4,7 @@ from plainbox.provider_manager import N_
 
 setup(
     name='2013.com.canonical.certification:checkbox',
-    version="0.21",
+    version="0.22",
     description=N_("Checkbox provider"),
     gettext_domain='plainbox-provider-checkbox',
     strict=False, deprecated=False,
-- 
cgit v1.2.3