Import plainbox-provider-checkbox_0.58.0~rc1.orig.tar.gzupstream-0.58.0_rc1patched-0.58.0_rc1-1

2 files changed, 32 insertions, 16 deletions

diff --git a/units/image/jobs.pxu b/units/image/jobs.pxu
index efe8d4e..d185550 100644
--- a/units/image/jobs.pxu
+++ b/units/image/jobs.pxu
@@ -1,8 +1,8 @@
 
 id: image/kernel-publisher-canonical
 category_id: image
-summary: Check that the kernel snap publisher is Canonical
-description:
+_summary: Check that the kernel snap publisher is Canonical
+_description:
 During certification testing IoT devices must be running a kernel supplied
 by Canonical
 plugin: shell
@@ -13,8 +13,8 @@ flags: preserve-locale
 
 id: image/kernel-tracking-stable
 category_id: image
-summary: Check that the kernel snap is tracking stable channel
-description:
+_summary: Check that the kernel snap is tracking stable channel
+_description:
 During certification testing IoT devices must be running a kernel that is on
 a stable channel
 plugin: shell
@@ -25,8 +25,8 @@ flags: preserve-locale
 
 id: image/gadget-publisher-canonical
 category_id: image
-summary: Check that the gadget snap publisher is Canonical
-description:
+_summary: Check that the gadget snap publisher is Canonical
+_description:
 During certification testing IoT devices must be running a kernel supplied
 by Canonical
 plugin: shell
@@ -37,8 +37,8 @@ flags: preserve-locale
 
 id: image/gadget-tracking-stable
 category_id: image
-summary: Check that the gadget snap is tracking stable channel
-description:
+_summary: Check that the gadget snap is tracking stable channel
+_description:
 During certification testing IoT devices must be running a gadget that is on
 a stable channel
 plugin: shell
@@ -49,8 +49,8 @@ flags: preserve-locale
 
 id: image/model-authority-canonical
 category_id: image
-summary: Check that model authority-id is canonical
-description:
+_summary: Check that model authority-id is canonical
+_description:
 The authority-id declares on whose authority this assertion is made. This
 must be Canonical for the certification of IoT devices.
 plugin: shell
@@ -61,12 +61,28 @@ flags: preserve-locale
 
 id: image/model-brand-canonical
 category_id: image
-summary: Check the model brand-id is canoncial
-description:
+_summary: Check the model brand-id is canoncial
+_description:
 For the certification of IoT devices canonical provided generic images must
 be used. Hence, the brand-id must be canonical.
 plugin: shell
 command:
 ubuntucore_image_checks.py model-brand
 estimated_duration: 2.0
-flags: preserve-locale \ No newline at end of file
+flags: preserve-locale
+
+id: image/model-grade-not-dangerous
+category_id: image
+_summary: Check that the model grade is not missing or set to dangerous
+requires:
+ lsb.distributor_id == "Ubuntu Core" and int(lsb.release) >= 20
+_description:
+ Images with the 'dangerous' grade (the lowest of all available grades)
+ results in certain security measures to be relaxed.
+ Images that require strict security related implementations must
+ have the model grade set to a grade higher than 'dangerous'.
+plugin: shell
+command:
+ ubuntucore_image_checks.py model-grade
+estimated_duration: 2.0
+flags: preserve-locale
diff --git a/units/image/test-plan.pxu b/units/image/test-plan.pxu
index 48af204..73e5fa3 100644
--- a/units/image/test-plan.pxu
+++ b/units/image/test-plan.pxu
@@ -1,7 +1,7 @@
 
 id: iot-cert-image-full
 unit: test plan
-name: Sanity checks for images being certified on IoT devices
+_name: Sanity checks for images being certified on IoT devices
 include:
 nested_part:
 iot-cert-image-manual
@@ -9,12 +9,12 @@ nested_part:
 
 id: iot-cert-image-automated
 unit: test plan
-name: Automated Sanity checks for images being certified on IoT devices
+_name: Automated Sanity checks for images being certified on IoT devices
 include:
 image/.*
 
 id: iot-cert-image-manual
 unit: test plan
-name: Manual Sanity checks for images being certified on IoT devices
+_name: Manual Sanity checks for images being certified on IoT devices
 include: