Merge branch 'master' into oem_meta_version_check

14 files changed, 14 insertions, 0 deletions

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