Merge branch 'master' into oem_meta_version_check

17 files changed, 152 insertions, 0 deletions

diff --git a/bin/check_grub_boothole.sh b/bin/check_grub_boothole.sh
new file mode 100755
index 0000000..9fe9db9
--- /dev/null
+++ b/bin/check_grub_boothole.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+cleanup()
+{
+ echo "Please refer to https://docs.google.com/document/d/1EheQcQ5fzdwW_JOXz5LChqObu6di4GztkxRtVxtUYGs/edit#heading=h.ek2fnosafgow for this test case."
+}
+
+trap cleanup EXIT HUP INT QUIT TERM
+
+case "$(lsb_release -cs)" in
+ (focal)
+ if ! sbverify --list "/boot/vmlinuz-$(uname -r)" | grep -oP "Secure Boot Signing (.*)"; then
+ echo "/boot/vmlinuz-$(uname -r) has invalid signature for Secure Boot."
+ exit 1
+ fi
+ TARGET_GRUB="2.04-1ubuntu26.2"
+ case "$(uname -r)" in
+ (5.4.0-*-generic)
+ TARGET_KERNEL=5.4.0-31-generic
+ ;;
+ (5.6.0-*-oem)
+ TARGET_KERNEL=5.6.0-1011-oem
+ ;;
+ (*)
+ echo "Not supported yet. Please report the bug."
+ exit 1
+ ;;
+ esac
+ ;;
+ (bionic)
+ TARGET_GRUB="2.02-2ubuntu8.17"
+ case "$(uname -r)" in
+ (4.15.0-*-generic)
+ TARGET_KERNEL=4.15.0-101-generic
+ ;;
+ (4.18.0-*-generic)
+ echo "There is no valid signature for 4.18.0-*-generic kernel."
+ exit 1
+ ;;
+ (4.15.0-*-oem)
+ TARGET_KERNEL=4.15.0-1087-oem
+ ;;
+ (5.0.0-*-oem-osp1)
+ TARGET_KERNEL=5.0.0-1059-oem-osp1
+ ;;
+ (5.0.0-*-generic)
+ TARGET_KERNEL=5.0.0-52-generic
+ ;;
+ (5.3.0-*-generic)
+ TARGET_KERNEL=5.3.0-53-generic
+ ;;
+ (5.4.0-*-generic)
+ TARGET_KERNEL=5.4.0-37-generic
+ ;;
+ (*)
+ echo "Not supported yet. Please report the bug."
+ exit 1
+ ;;
+ esac
+ ;;
+ (xenial)
+ TARGET_GRUB="2.02~beta2-36ubuntu3.27"
+ case "$(uname -r)" in
+ (4.4.0-*-generic)
+ TARGET_KERNEL=4.4.0-184-generic
+ ;;
+ (4.8.0-*-generic)
+ echo "There is no valid signature for 4.8.0-*-generic kernel."
+ exit 1
+ ;;
+ (4.10.0-*-generic)
+ echo "There is no valid signature for 4.10.0-*-generic kernel."
+ exit 1
+ ;;
+ (4.11.0-*-generic)
+ echo "There is no valid signature for 4.11.0-*-generic kernel."
+ exit 1
+ ;;
+ (4.13.0-*-generic)
+ echo "There is no valid signature for 4.13.0-*-generic kernel."
+ exit 1
+ ;;
+ (4.13.0-*-oem)
+ echo "There is no valid signature for 4.13.0-*-oem kernel."
+ exit 1
+ ;;
+ (4.15.0-*-generic)
+ TARGET_KERNEL=4.15.0-101-generic
+ ;;
+ (*)
+ echo "Not supported yet. Please report the bug."
+ exit 1
+ ;;
+ esac
+ ;;
+ (*)
+ echo "Not supported yet. Please report the bug."
+ exit 1
+ ;;
+esac
+
+CURRENT=$(dpkg-query -W -f='${Version}\n' grub-efi-amd64)
+
+if [ -z "$CURRENT" ]; then
+ echo "Can not find grub-efi-amd64 version."
+ exit 1
+fi
+
+if dpkg --compare-versions "$CURRENT" lt "$TARGET_GRUB"; then
+ echo "GRUB version needs to be $TARGET_GRUB at least, but it is $CURRENT now."
+ exit 1
+fi
+
+if dpkg --compare-versions "$(uname -r)" lt "$TARGET_KERNEL"; then
+ echo "Kernel version needs to be $TARGET_KERNEL at least, but it is $(uname -r) now."
+ exit 1
+fi
diff --git a/debian/changelog b/debian/changelog
index 0ab06a3..8db5302 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+plainbox-provider-oem (0.77) focal; urgency=medium
+
+ * Add the document link for grub boothole test case.
+ * Add a test case for GRUB's boothole issue.
+ * Add Serial Port Config
+ * Add Addon Test Plan for Somerville and Stella
+ * Add oem-generic-addoncard test plan
+ * Update BIOS Regression Test case for TPM2.0 (t.ly/M1i6)
+ * Remove Add-on/ Regression stress test for Somerville and Stella
+
+ -- Pierre Equoy <pierre.equoy@canonical.com> Tue, 25 Aug 2020 09:01:32 +0000
+
 plainbox-provider-oem (0.76) focal; urgency=medium
 
 * bin: add package test script, revise tests to automation
diff --git a/jobs/misc/misc-generic.txt b/jobs/misc/misc-generic.txt
index a5f31c6..d3d44f7 100644
--- a/jobs/misc/misc-generic.txt
+++ b/jobs/misc/misc-generic.txt
@@ -76,3 +76,12 @@ user: root
 command:
 stock_ubuntu_platform_meta.sh
 _description: Check if the platform meta package can be installed from Ubuntu archives.
+
+plugin: shell
+id: misc/generic/grub_boothole
+user: root
+command:
+ check_grub_boothole.sh
+_description:
+ Check if kernel and grub are new enough to fix the boothole issue.
+ https://docs.google.com/document/d/1EheQcQ5fzdwW_JOXz5LChqObu6di4GztkxRtVxtUYGs/edit#heading=h.ek2fnosafgow
diff --git a/units/oem-generic-auto.pxu b/units/oem-generic-auto.pxu
index f89f57a..5ecd1ad 100644
--- a/units/oem-generic-auto.pxu
+++ b/units/oem-generic-auto.pxu
@@ -3,5 +3,6 @@ _name: OEM Generic Auto
 unit: test plan
 _description: The generic auto test plan for all OEM projects.
 include:
+ misc/generic/grub_boothole
 nested_part:
 com.canonical.certification::client-cert-auto
diff --git a/units/somerville-bios-regression.pxu b/units/somerville-bios-regression.pxu
index a8a104b..224ce0f 100644
--- a/units/somerville-bios-regression.pxu
+++ b/units/somerville-bios-regression.pxu
@@ -12,6 +12,7 @@ include:
 somerville/dell-repository
 somerville/installation
 somerville/desktop-kpi-dashboard
+ misc/generic/grub_boothole
 nested_part:
 somerville-oem-meta
 com.canonical.certification::submission-cert-full
diff --git a/units/somerville-fv-regression.pxu b/units/somerville-fv-regression.pxu
index 4d1bd42..e31ee65 100644
--- a/units/somerville-fv-regression.pxu
+++ b/units/somerville-fv-regression.pxu
@@ -14,6 +14,7 @@ include:
 somerville/desktop-kpi-dashboard
 com.canonical.certification::audio/channels
 com.canonical.certification::audio/external-lineout
+ misc/generic/grub_boothole
 nested_part:
 somerville-oem-meta
 oobe
diff --git a/units/somerville-iev-full-18-04.pxu b/units/somerville-iev-full-18-04.pxu
index 75e5ff2..f42b984 100644
--- a/units/somerville-iev-full-18-04.pxu
+++ b/units/somerville-iev-full-18-04.pxu
@@ -13,6 +13,7 @@ include:
 somerville/installation
 somerville/platform-meta-test
 somerville/desktop-kpi-dashboard
+ misc/generic/grub_boothole
 nested_part:
 oem-generic-full
 power-management-s
diff --git a/units/somerville-iev-full-20-04.pxu b/units/somerville-iev-full-20-04.pxu
index ce214fb..077ad22 100644
--- a/units/somerville-iev-full-20-04.pxu
+++ b/units/somerville-iev-full-20-04.pxu
@@ -15,6 +15,7 @@ include:
 somerville/fingerprint-login
 somerville/fingerprint-negative
 somerville/fingerprint-positive
+ misc/generic/grub_boothole
 nested_part:
 somerville-oem-meta
 oem-generic-full-20-04
diff --git a/units/stella-full-18-04.pxu b/units/stella-full-18-04.pxu
index 6d9487c..6725155 100644
--- a/units/stella-full-18-04.pxu
+++ b/units/stella-full-18-04.pxu
@@ -8,6 +8,7 @@ include:
 stella/hp-wallpaper
 stella/sourcelist/.*-repository$
 stella/desktop-kpi-dashboard
+ misc/generic/grub_boothole
 nested_part:
 oem-generic-full
 power-management-stella
diff --git a/units/stella-full-20-04.pxu b/units/stella-full-20-04.pxu
index 2f8d795..6e372ec 100644
--- a/units/stella-full-20-04.pxu
+++ b/units/stella-full-20-04.pxu
@@ -10,6 +10,7 @@ include:
 stella/fingerprint-login
 stella/fingerprint-negative
 stella/fingerprint-positive
+ misc/generic/grub_boothole
 nested_part:
 stella-oem-meta
 oem-generic-full-20-04
diff --git a/units/stella-regression.pxu b/units/stella-regression.pxu
index 1b58a6a..288ebcc 100644
--- a/units/stella-regression.pxu
+++ b/units/stella-regression.pxu
@@ -7,6 +7,7 @@ include:
 stella/hp-documents
 stella/hp-wallpaper
 stella/desktop-kpi-dashboard
+ misc/generic/grub_boothole
 nested_part:
 stella-oem-meta
 oem-generic-blocker
diff --git a/units/sutton-full-16-04-osp1.pxu b/units/sutton-full-16-04-osp1.pxu
index ad1598b..84ae135 100644
--- a/units/sutton-full-16-04-osp1.pxu
+++ b/units/sutton-full-16-04-osp1.pxu
@@ -12,6 +12,7 @@ include:
 com.canonical.ce::sutton/infrared/infrared-camera-disabled
 com.canonical.ce::sutton/desktop-kpi-dashboard
 com.canonical.ce::sutton/specific/watermark
+ misc/generic/grub_boothole
 nested_part:
 com.canonical.certification::submission-cert-full
 com.canonical.certification::audio-cert-full
diff --git a/units/sutton-full-16-04.pxu b/units/sutton-full-16-04.pxu
index f3c21dd..77aff50 100644
--- a/units/sutton-full-16-04.pxu
+++ b/units/sutton-full-16-04.pxu
@@ -477,6 +477,7 @@ include:
 com.canonical.certification::info/network_devices
 com.canonical.certification::info/xrandr
 com.canonical.certification::info/disk_partitions
+ misc/generic/grub_boothole
 #unit: category
 #id: sutton
 #_name: Suttn tests
diff --git a/units/sutton-full-18-04.pxu b/units/sutton-full-18-04.pxu
index 9063829..72a1ba4 100644
--- a/units/sutton-full-18-04.pxu
+++ b/units/sutton-full-18-04.pxu
@@ -10,6 +10,7 @@ include:
 com.canonical.ce::sutton/sourceslist/subproject-bionic
 com.canonical.ce::sutton/user-documents
 com.canonical.ce::sutton/desktop-kpi-dashboard
+ misc/generic/grub_boothole
 nested_part:
 oem-generic-full
 mandatory_include:
diff --git a/units/sutton-full-20-04.pxu b/units/sutton-full-20-04.pxu
index 4d31e6e..5064a17 100644
--- a/units/sutton-full-20-04.pxu
+++ b/units/sutton-full-20-04.pxu
@@ -10,6 +10,7 @@ include:
 com.canonical.ce::sutton/fingerprint-login
 com.canonical.ce::sutton/fingerprint-negative
 com.canonical.ce::sutton/fingerprint-positive
+ misc/generic/grub_boothole
 nested_part:
 oem-generic-full-20-04
 sutton-oem-meta
diff --git a/units/sutton-full.pxu b/units/sutton-full.pxu
index 73d32a4..3fcfae9 100644
--- a/units/sutton-full.pxu
+++ b/units/sutton-full.pxu
@@ -10,6 +10,7 @@ include:
 com.canonical.ce::sutton/sourceslist/subproject-bionic
 com.canonical.ce::sutton/user-documents
 com.canonical.ce::sutton/desktop-kpi-dashboard
+ misc/generic/grub_boothole
 nested_part:
 oem-generic-full
 mandatory_include:
diff --git a/units/sutton-regression.pxu b/units/sutton-regression.pxu
index ffd2c7f..1ce6f00 100644
--- a/units/sutton-regression.pxu
+++ b/units/sutton-regression.pxu
@@ -8,6 +8,7 @@ include:
 com.canonical.ce::sutton/sourceslist/security
 com.canonical.ce::sutton/sourceslist/project-timbuktu-base
 com.canonical.ce::sutton/sourceslist/subproject-bionic
+ misc/generic/grub_boothole
 nested_part:
 oem-generic-blocker
 # The following part MUST run last