Import plainbox-provider-checkbox_0.49.0~rc5.orig.tar.gzupstream-0.49.0_rc5patched-0.49.0_rc5-1

6 files changed, 25 insertions, 26 deletions

diff --git a/units/disk/packaging.pxu b/units/disk/packaging.pxu
index 515d8e1..aef0252 100644
--- a/units/disk/packaging.pxu
+++ b/units/disk/packaging.pxu
@@ -7,3 +7,8 @@ Depends: nvme-cli
 unit: packaging meta-data
 os-id: debian
 Depends: uuid-runtime
+
+# This is for disk/storage_device_*
+unit: packaging meta-data
+os-id: debian
+Depends: python3-psutil
diff --git a/units/firmware/jobs.pxu b/units/firmware/jobs.pxu
index 4dae484..9ebc734 100644
--- a/units/firmware/jobs.pxu
+++ b/units/firmware/jobs.pxu
@@ -66,15 +66,6 @@ command:
 _description: Attaches the FWTS desktop diagnosis results log to the submission (to HWE)
 _summary: Attach FWTS desktop diagnosis log to submission (to HWE)
 
-plugin: shell
-category_id: com.canonical.plainbox::firmware
-id: firmware/no_ACPI_REV_interface
-_summary: No _REV interface in ACPI [DS]SDT tables
-user: root
-estimated_duration: 0.5
-command: ! sudo grep -r "_REV" /sys/firmware/acpi/tables/* | grep [DS]SDT
-_description: This Automated test checks misuse of the _REV interface in ACPI DSDT and SSDT tables
-
 plugin:shell
 category_id: com.canonical.plainbox::firmware
 id: firmware/fwts_server
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index a8224ef..01ec380 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -538,4 +538,4 @@ user: root
 command:
 {switch_to_cmd}
 pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
-flags: noreturn preserve-locale
+flags: noreturn preserve-locale also-after-suspend
diff --git a/units/graphics/test-plan.pxu b/units/graphics/test-plan.pxu
index fd52dc7..4b8c7ec 100644
--- a/units/graphics/test-plan.pxu
+++ b/units/graphics/test-plan.pxu
@@ -99,7 +99,7 @@ unit: test plan
 _name: After suspend tests (integrated GPU automated)
 _description: After suspend tests (integrated GPU automated)
 include:
- graphics/1_auto_switch_card_.* certification-status=blocker
+ after-suspend-graphics/1_auto_switch_card_.* certification-status=blocker
 suspend/1_suspend_after_switch_to_card_.*_auto certification-status=blocker
 # The following after suspend jobs will automatically select the right suspend job
 # depending on the amount of graphic cards available on the SUT:
@@ -166,16 +166,18 @@ unit: test plan
 _name: Graphics tests (integrated GPU, certification blockers only)
 _description: Graphics tests (integrated GPU, certification blockers only)
 include:
- graphics/xorg-version certification-status=blocker
- graphics/xorg-failsafe certification-status=blocker
- graphics/xorg-process certification-status=blocker
- graphics/VESA_drivers_not_in_use certification-status=blocker
- graphics/1_maximum_resolution_.* certification-status=blocker
- graphics/1_glxgears_.* certification-status=blocker
- graphics/1_driver_version_.* certification-status=blocker
- graphics/1_compiz_check_.* certification-status=blocker
- graphics/1_rotation_.* certification-status=blocker
- graphics/1_video_.* certification-status=blocker
+ graphics/1_auto_switch_card_.* certification-status=blocker
+ graphics/xorg-version certification-status=blocker
+ graphics/xorg-failsafe certification-status=blocker
+ graphics/xorg-process certification-status=blocker
+ graphics/VESA_drivers_not_in_use certification-status=blocker
+ graphics/1_maximum_resolution_.* certification-status=blocker
+ graphics/1_glxgears_.* certification-status=blocker
+ graphics/1_driver_version_.* certification-status=blocker
+ graphics/1_compiz_check_.* certification-status=blocker
+ graphics/1_rotation_.* certification-status=blocker
+ graphics/1_video_.* certification-status=blocker
+ suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
 bootstrap_include:
 graphics_card
 
@@ -200,9 +202,8 @@ unit: test plan
 _name: After suspend tests (integrated GPU, certification blockers only)
 _description: After suspend tests (integrated GPU, certification blockers only)
 include:
- graphics/1_auto_switch_card_.* certification-status=blocker
- suspend/1_resolution_before_suspend_.*_auto certification-status=blocker
- suspend/suspend_advanced certification-status=blocker
+ after-suspend-graphics/1_auto_switch_card_.* certification-status=blocker
+ suspend/1_suspend_after_switch_to_card_.*_auto certification-status=blocker
 power-management/lid certification-status=blocker
 power-management/lid_close certification-status=blocker
 power-management/lid_open certification-status=blocker
diff --git a/units/miscellanea/test-plan.pxu b/units/miscellanea/test-plan.pxu
index b63d34f..1b119f1 100644
--- a/units/miscellanea/test-plan.pxu
+++ b/units/miscellanea/test-plan.pxu
@@ -30,7 +30,6 @@ include:
 firmware/fwts_desktop_diagnosis_results.log.gz
 firmware/fwts_wakealarm.* certification-status=blocker
 firmware/fwts_uefirtvariable.* certification-status=blocker
- firmware/no_ACPI_REV_interface certification-status=blocker
 miscellanea/oops certification-status=blocker
 miscellanea/oops_results.log
 miscellanea/dmitest_client
@@ -49,7 +48,6 @@ include:
 firmware/fwts_desktop_diagnosis_results.log.gz
 firmware/fwts_wakealarm.* certification-status=blocker
 firmware/fwts_uefirtvariable.* certification-status=blocker
- firmware/no_ACPI_REV_interface certification-status=blocker
 miscellanea/oops certification-status=blocker
 miscellanea/oops_results.log
 bootstrap_include:
diff --git a/units/networking/packaging.pxu b/units/networking/packaging.pxu
index b71caa7..06f212f 100644
--- a/units/networking/packaging.pxu
+++ b/units/networking/packaging.pxu
@@ -1,3 +1,7 @@
 unit: packaging meta-data
 os-id: debian
 Depends: ntpdate, net-tools
+
+unit: packaging meta-data
+os-id: debian
+Depends: iperf3