12 files changed, 365 insertions, 131 deletions
diff --git a/units/bluetooth/jobs.pxu b/units/bluetooth/jobs.pxu
index 7ab5243..f40a6e0 100644
--- a/units/bluetooth/jobs.pxu
+++ b/units/bluetooth/jobs.pxu
@@ -1,3 +1,32 @@
+unit: job
+id: bluetooth/detect
+category_id: com.canonical.plainbox::bluetooth
+_summary: Make sure at least one bluetooth device is detected
+plugin: shell
+command:
+ bt_list_adapters.py
+estimated_duration: 2s
+flags: preserve-locale
+requires: manifest.has_bt_adapter
+imports: from com.canonical.plainbox import manifest
+
+id: bluetooth/bluez-controller-detect
+category_id: com.canonical.plainbox::bluetooth
+_summary: Check bluez lists a controller if rfkill detects one
+plugin: shell
+user: root
+depends: bluetooth/detect
+template-engine: jinja2
+requires:
+ package.name == 'bluez' or snap.name == 'bluez'
+ {%- if __on_ubuntucore__ %}
+ connections.slot == 'bluez:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:bluez'
+ {% endif -%}
+command:
+ bluez_list_adapters.py
+estimated_duration: 2s
+flags: preserve-locale
+
 plugin: shell
 category_id: com.canonical.plainbox::bluetooth
 id: bluetooth/detect-output
diff --git a/units/bluetooth/manifest.pxu b/units/bluetooth/manifest.pxu
index ebf5874..576f7a8 100644
--- a/units/bluetooth/manifest.pxu
+++ b/units/bluetooth/manifest.pxu
@@ -1,4 +1,9 @@
 unit: manifest entry
+id: has_bt_adapter
+_name: A Bluetooth Adapter
+value-type: bool
+
+unit: manifest entry
 id: has_bt_smart
 _name: Bluetooth Smart (4.0 or later) Support
 value-type: bool
diff --git a/units/ethernet/test-plan.pxu b/units/ethernet/test-plan.pxu
index 6ad7620..6a6af73 100644
--- a/units/ethernet/test-plan.pxu
+++ b/units/ethernet/test-plan.pxu
@@ -38,6 +38,13 @@ include:
 nested_part:
 after-suspend-ethernet-automated
 
+id: after-suspend-ethernet-manual
+unit: test plan
+_name: Manual ethernet tests (after suspend)
+_description: Manual ethernet tests for Ubuntu Core devices
+estimated_duration: 1m
+include:
+
 id: after-suspend-ethernet-automated
 unit: test plan
 _name: Automated ethernet tests (after suspend)
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 40f7299..a8224ef 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -46,7 +46,7 @@ id: graphics/xorg-process
 requires:
 package.name == 'xorg'
 package.name == 'procps'
-command: pgrep -f '/usr/bin/X' >/dev/null
+command: pgrep -a -f '/usr/lib/xorg/Xorg'
 estimated_duration: 0.100
 _description: Test that the X process is running.
 _summary: Test that the X process is running.
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index 4485829..3170566 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -345,6 +345,8 @@ _summary: Attaches the buildstamp identifier for the OS
 command:
 if [ -s /etc/buildstamp ]; then
 cat /etc/buildstamp
+ elif [ -s /etc/media-info ]; then
+ cat /etc/media-info
 elif [ -e /var/lib/snapd/seed/seed.yaml ]; then
 echo && date -r /var/lib/snapd/seed/seed.yaml -R
 else
diff --git a/units/mediacard/jobs.pxu b/units/mediacard/jobs.pxu
index 7bbfded..01c0ad0 100644
--- a/units/mediacard/jobs.pxu
+++ b/units/mediacard/jobs.pxu
@@ -5,13 +5,12 @@ id: mediacard/mmc-insert
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher insertion mediacard
 {%- else %}
 removable_storage_watcher --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
 user: root
 _description:
@@ -27,15 +26,19 @@ _description:
 automatically selected result.
 
 plugin: shell
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/mmc-storage
 estimated_duration: 30.0
 depends: mediacard/mmc-insert
 user: root
-flags: preserve-cwd
-command: removable_storage_test -s 67120000 --memorycard sdio usb scsi --auto-reduce-size
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 67120000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 _description:
 This test is automated and executes after the mediacard/mmc-insert
 test is run. It tests reading and writing to the MMC card.
@@ -48,7 +51,7 @@ estimated_duration: 30.0
 depends: mediacard/mmc-insert
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher removal mediacard
 {%- else %}
 removable_storage_watcher --memorycard remove sdio usb scsi
 {% endif -%}
@@ -71,16 +74,15 @@ id: mediacard/sd-insert
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher insertion mediacard
 {%- else %}
 removable_storage_watcher --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
 user: root
-_summary: Test that insertion of an SD card is detected (udisks2)
+_summary: Test that insertion of an SD card is detected
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -94,16 +96,20 @@ _description:
 automatically selected result.
 
 plugin: shell
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/sd-storage
 estimated_duration: 30.0
 depends: mediacard/sd-insert
 user: root
-flags: preserve-cwd
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
-_summary: Test reading & writing to a SD Card (udisks2)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
+_summary: Test reading & writing to a SD Card
 _description:
 This test is automated and executes after the mediacard/sd-insert
 test is run. It tests reading and writing to the SD card.
@@ -116,7 +122,7 @@ estimated_duration: 30.0
 depends: mediacard/sd-insert
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher removal mediacard
 {%- else %}
 removable_storage_watcher --memorycard remove sdio usb scsi
 {% endif -%}
@@ -143,7 +149,6 @@ command: removable_storage_test -s 268400000 --memorycard -l sdio usb scsi && re
 imports: from com.canonical.plainbox import manifest
 requires:
 package.name == 'udisks2' or snap.name == 'udisks2'
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
 manifest.has_card_reader == 'True'
 _summary: Automated test of SD Card reading & writing (udisk2)
 _description:
@@ -158,16 +163,15 @@ id: mediacard/sdhc-insert
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher insertion mediacard
 {%- else %}
 removable_storage_watcher --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
 user: root
-_summary: Test that insertion of an SDHC card is detected (udisks2)
+_summary: Test that insertion of an SDHC card is detected
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -182,16 +186,20 @@ _description:
 automatically selected result.
 
 plugin: shell
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/sdhc-storage
 estimated_duration: 30.0
 depends: mediacard/sdhc-insert
 user: root
-flags: preserve-cwd
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
-_summary: Test that insertion of an SDHC card is detected (udisks2)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
+_summary: Test that insertion of an SDHC card is detected
 _description:
 This test is automated and executes after the mediacard/sdhc-insert
 test is run. It tests reading and writing to the SDHC card.
@@ -204,7 +212,7 @@ estimated_duration: 30.0
 depends: mediacard/sdhc-insert
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher removal mediacard
 {%- else %}
 removable_storage_watcher --memorycard remove sdio usb scsi
 {% endif -%}
@@ -228,13 +236,12 @@ id: mediacard/cf-insert
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher insertion mediacard
 {%- else %}
 removable_storage_watcher --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
 user: root
 _description:
@@ -250,14 +257,19 @@ _description:
 automatically selected result.
 
 plugin: shell
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/cf-storage
 estimated_duration: 30.0
 depends: mediacard/cf-insert
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 _description:
 This test is automated and executes after the mediacard/cf-insert
 test is run. It tests reading and writing to the CF card.
@@ -270,7 +282,7 @@ depends: mediacard/cf-storage
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher removal mediacard
 {%- else %}
 removable_storage_watcher --memorycard remove sdio usb scsi
 {% endif -%}
@@ -293,16 +305,15 @@ id: mediacard/sdxc-insert
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher insertion mediacard
 {%- else %}
 removable_storage_watcher --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
 user: root
-_summary: Test that insertion of an SDXC card is detected (udisks2)
+_summary: Test that insertion of an SDXC card is detected
 _description:
 PURPOSE:
 This test will check that the systems media card reader can
@@ -316,15 +327,20 @@ _description:
 automatically selected result.
 
 plugin: shell
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/sdxc-storage
 estimated_duration: 30.0
 depends: mediacard/sdxc-insert
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
-_summary: Test reading & writing to a SDXC Card (udisks2)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
+_summary: Test reading & writing to a SDXC Card
 _description:
 This test is automated and executes after the mediacard/sdxc-insert
 test is run. It tests reading and writing to the SDXC card.
@@ -337,7 +353,7 @@ estimated_duration: 30.0
 depends: mediacard/sdxc-insert
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher removal mediacard
 {%- else %}
 removable_storage_watcher --memorycard remove sdio usb scsi
 {% endif -%}
@@ -361,13 +377,12 @@ id: mediacard/ms-insert
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher insertion mediacard
 {%- else %}
 removable_storage_watcher --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
 user: root
 _description:
@@ -383,14 +398,19 @@ _description:
 automatically selected result.
 
 plugin: shell
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/ms-storage
 estimated_duration: 30.0
 depends: mediacard/ms-insert
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 _description:
 This test is automated and executes after the mediacard/ms-insert
 test is run. It tests reading and writing to the MS card.
@@ -403,7 +423,7 @@ estimated_duration: 30.0
 depends: mediacard/ms-insert
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher removal mediacard
 {%- else %}
 removable_storage_watcher --memorycard remove sdio usb scsi
 {% endif -%}
@@ -426,14 +446,13 @@ id: mediacard/msp-insert
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher insertion mediacard
 {%- else %}
 removable_storage_watcher --memorycard insert sdio usb scsi
 {% endif -%}
 user: root
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
 _description:
 PURPOSE:
@@ -448,14 +467,19 @@ _description:
 automatically selected result.
 
 plugin: shell
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/msp-storage
 estimated_duration: 30.0
 depends: mediacard/msp-insert
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 _description:
 This test is automated and executes after the mediacard/msp-insert
 test is run. It tests reading and writing to the MSP card.
@@ -468,7 +492,7 @@ estimated_duration: 30.0
 depends: mediacard/msp-insert
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher removal mediacard
 {%- else %}
 removable_storage_watcher --memorycard remove sdio usb scsi
 {% endif -%}
@@ -491,13 +515,12 @@ id: mediacard/xd-insert
 estimated_duration: 30.0
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kadd.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher insertion mediacard
 {%- else %}
 removable_storage_watcher --memorycard insert sdio usb scsi
 {% endif -%}
 imports: from com.canonical.plainbox import manifest
 requires:
- package.name == 'udisks2' or snap.name == 'udisks2'
 manifest.has_card_reader == 'True'
 user: root
 _description:
@@ -513,14 +536,19 @@ _description:
 automatically selected result.
 
 plugin: shell
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/xd-storage
 estimated_duration: 30.0
 depends: mediacard/xd-insert
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 _description:
 This test is automated and executes after the mediacard/xd-insert
 test is run. It tests reading and writing to the xD card.
@@ -533,7 +561,7 @@ estimated_duration: 30.0
 depends: mediacard/xd-insert
 command:
 {%- if __on_ubuntucore__ %}
- timeout 20s bash -c 'grep -m 1 -oP "\Kremove.*?mmc.*?\s" <( exec journalctl -u snap.udisks2.udisksd -f -q -S -1s ); kill $!'
+ checkbox-support-run_watcher removal mediacard
 {%- else %}
 removable_storage_watcher --memorycard remove sdio usb scsi
 {% endif -%}
@@ -550,14 +578,19 @@ _description:
 automatically selected result.
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/sd-performance-manual
 depends: mediacard/sd-insert
 estimated_duration: 120.0
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome")
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
 PURPOSE:
@@ -569,14 +602,19 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/sdhc-performance-manual
 depends: mediacard/sdhc-insert
 estimated_duration: 120.0
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome")
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
 PURPOSE:
@@ -588,14 +626,19 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/mmc-performance-manual
 depends: mediacard/mmc-insert
 estimated_duration: 120.0
 user: root
-command: removable_storage_test -s 209715200 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome")
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 209715200 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
 PURPOSE:
@@ -607,14 +650,19 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/cf-performance-manual
 depends: mediacard/cf-insert
 estimated_duration: 120.0
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome")
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
 PURPOSE:
@@ -626,14 +674,19 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/sdxc-performance-manual
 depends: mediacard/sdxc-insert
 estimated_duration: 120.0
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome")
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
 PURPOSE:
@@ -645,14 +698,19 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/ms-performance-manual
 depends: mediacard/ms-insert
 estimated_duration: 120.0
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome")
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
 PURPOSE:
@@ -664,14 +722,19 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/msp-performance-manual
 depends: mediacard/msp-insert
 estimated_duration: 120.0
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome")
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
 PURPOSE:
@@ -683,14 +746,19 @@ _description:
 Did the results of the test match the expected performance of the inserted device?
 
 plugin: user-interact-verify
+template-engine: jinja2
 category_id: com.canonical.plainbox::mediacard
 id: mediacard/xd-performance-manual
 depends: mediacard/xd-insert
 estimated_duration: 120.0
 user: root
-command: removable_storage_test -s 268400000 --memorycard sdio usb | cat <(echo "Working...") - <(echo; echo "Verify the result and decide on the outcome")
-requires:
- package.name == 'udisks2' or (snap.name == 'core' and int(snap.revision) >= 1804)
+flags: preserve-cwd reset-locale
+command:
+ {%- if __on_ubuntucore__ %}
+ checkbox-support-usb_read_write
+ {%- else %}
+ removable_storage_test -s 268400000 --memorycard sdio usb scsi --auto-reduce-size
+ {% endif -%}
 environ: LD_LIBRARY_PATH GI_TYPELIB_PATH
 _description:
 PURPOSE:
diff --git a/units/oob-management/category.pxu b/units/oob-management/category.pxu
new file mode 100644
index 0000000..b9c9ae5
--- /dev/null
+++ b/units/oob-management/category.pxu
@@ -0,0 +1,4 @@
+
+unit: category
+id: oob-management
+_name: Out-Of-Band Management tools tests
diff --git a/units/oob-management/jobs.pxu b/units/oob-management/jobs.pxu
new file mode 100644
index 0000000..5615a65
--- /dev/null
+++ b/units/oob-management/jobs.pxu
@@ -0,0 +1,133 @@
+
+id: oob-management/amt/amtinfo_cmd
+_summary: Check the output of the AmtInfo command is valid
+category_id: oob-management
+plugin: user-interact-verify
+user: root
+requires:
+ executable.name == 'meshcmd'
+_steps:
+ Checkbox will run the meshcmd AmtInfo command
+command:
+ set -x
+ meshcmd amtinfo
+_verification:
+ Check the command ran correctly.
+ Check the correct ME FW version is shown.
+ Correct Provisioning state is shown (should be pre-provisioning for 
+ unprovisioned SUT).
+
+
+id: oob-management/amt/smbios_cmd
+_summary: Check the output of the SMBios command is valid
+category_id: oob-management
+plugin: user-interact-verify
+user: root
+requires:
+ executable.name == 'meshcmd'
+_steps:
+ Checkbox will run the meshcmd SMBios command
+command:
+ set -x
+ meshcmd smbios
+_verification:
+ Check the Processor Info is correct.
+ Check the Memory Info is correct.
+ Check the System Info is correct.
+ Check the AMT info is correct.
+
+
+id: oob-management/amt/amtversions_cmd
+_summary: Check the output of the AmtVersions command is valid
+category_id: oob-management
+plugin: user-interact-verify
+user: root
+requires:
+ executable.name == 'meshcmd'
+_steps:
+ Checkbox will run the meshcmd AmtVersions command
+command:
+ set -x
+ meshcmd amtversions
+_verification:
+ Check the MEI version is correct.
+ Check the AMT version is correct.
+ Check the Sku is correct.
+ Check the Build Number is correct.
+
+
+id: oob-management/amt/amtccm_provisioning
+_summary: Check that Client Control Mode can be reached
+category_id: oob-management
+plugin: user-interact-verify
+user: root
+requires:
+ executable.name == 'meshcmd'
+_steps:
+ Checkbox will run the meshcmd amtccm command and set a password
+command:
+ set -x
+ meshcmd amtccm --password intelamt
+ meshcmd amtinfo
+_verification:
+ Check that the AmtCCM command returns Sucess.
+ Check that the output of the AmtInfo command now shows activated in client
+ control mode.
+
+
+id: oob-management/amt/amtccm_webui
+_summary: Check that Client Control Mode can be reached
+category_id: oob-management
+plugin: manual
+depends: oob-management/amt/amtccm_provisioning
+_steps:
+ Use a desktop PC on the same network as the SUT to attempt to connect to the WebUI.
+ In a browser enter http://<addres-of-sut>:16992 as the location.
+_verification:
+ Verify that WebUI is shown. 
+ Check the HW inventory is correct. 
+ Run a couple of remote power commands and verify they are run successfully.
+
+
+id: oob-management/amt/amtccm_deactivate
+_summary: Check that Client Control Mode can be deactivated
+category_id: oob-management
+plugin: user-interact-verify
+after: oob-management/amt/amtccm_webui
+user: root
+requires:
+ executable.name == 'meshcmd'
+_steps:
+ Checkbox will run the meshcmd amtdeactivate command
+command:
+ set -x
+ meshcmd amtdeactivate
+_verification:
+ Check that the deactivation completed successfully.
+
+
+id: oob-management/amt/lms_service_running
+_summary: Check the LMS service is running
+category_id: oob-management
+plugin: shell
+template-engine: jinja2
+requires:
+ {%- if __on_ubuntucore__ %}
+ # TODO: name is a guess until snap provided
+ snap.name == 'lms'
+ {%- else %}
+ package.name == 'lms'
+ {% endif -%}
+command:
+ {%- if __on_ubuntucore__ %}
+ # TODO: name is a guess until snap provided
+ SERVICE_NAME="snap.lms.lms.service"
+ {%- else %}
+ SERVICE_NAME="lms.service"
+ {% endif -%}
+ systemctl is-active --quiet "$SERVICE_NAME"
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+ systemctl status "$SERVICE_NAME"
+ exit $RETVAL
+ fi \ No newline at end of file
diff --git a/units/oob-management/test-plan.pxu b/units/oob-management/test-plan.pxu
new file mode 100644
index 0000000..9a06b47
--- /dev/null
+++ b/units/oob-management/test-plan.pxu
@@ -0,0 +1,32 @@
+
+id: oob-management-full
+unit: test plan
+_name: QA tests for Out-of-Band Management tools
+_description:
+ Tests for tools for Out-of-Band Management tools such as Intel AMT
+include:
+nested_part:
+ oob-management-manual
+ oob-management-automated
+
+id: oob-management-manual
+unit: test plan
+_name: Maual Out-of-Band Management tools tests
+_description:
+ Tests for tools for Out-of-Band Management tools such as Intel AMT
+include:
+ oob-management/amt/amtinfo_cmd
+ oob-management/amt/smbios_cmd
+ oob-management/amt/amtversions_cmd
+ oob-management/amt/amtccm_provisioning
+ oob-management/amt/amtccm_webui
+ oob-management/amt/amtccm_deactivate
+
+
+id: oob-management-automated
+unit: test plan
+_name: Automated Out-of-Band Management tools tests
+_description:
+ Tests for tools for Out-of-Band Management tools such as Intel AMT
+include:
+ oob-management/amt/lms_service_running \ No newline at end of file
diff --git a/units/submission/jobs.pxu b/units/submission/jobs.pxu
index 7d20950..a2f5382 100644
--- a/units/submission/jobs.pxu
+++ b/units/submission/jobs.pxu
@@ -89,3 +89,5 @@ category_id: com.canonical.plainbox::info
 command: system_info.py
 _description: Attaches json dumps of system info tools (inxi + udev)
 _summary: Attaches json dumps of system info tools
+requires:
+ cpuinfo.platform not in ("aarch64")
diff --git a/units/touchpad/jobs.pxu b/units/touchpad/jobs.pxu
index ed23ad2..2fba8ad 100644
--- a/units/touchpad/jobs.pxu
+++ b/units/touchpad/jobs.pxu
@@ -52,33 +52,10 @@ _siblings:
 [{ "id": "touchpad/vertical-after-suspend",
 "depends": "suspend/suspend_advanced touchpad/vertical" }]
 
-plugin: shell
-category_id: com.canonical.plainbox::touchpad
-id: touchpad/singletouch-automated
-requires:
- dmi.product in ['Notebook','Laptop','Portable','Convertible']
- xinput.device_class == 'XITouchClass' and xinput.touch_mode != 'dependent'
-command: true
-estimated_duration: 1.2
-_purpose:
- Determine whether the touchpad is detected as a singletouch device automatically.
-
-plugin: shell
-category_id: com.canonical.plainbox::touchpad
-id: touchpad/multitouch-automated
-estimated_duration: 1.2
-requires:
- dmi.product in ['Notebook','Laptop','Portable','Convertible']
- xinput.device_class == 'XITouchClass' and xinput.touch_mode == 'dependent'
-command: true
-_purpose:
- Determine whether the touchpad is detected as a multitouch device automatically.
-
 plugin: manual
 category_id: com.canonical.plainbox::touchpad
 id: touchpad/multitouch-manual
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-depends: touchpad/singletouch-automated
 estimated_duration: 120.0
 _purpose:
 Touchpad manual detection of multitouch.
@@ -92,20 +69,6 @@ _siblings:
 
 plugin: manual
 category_id: com.canonical.plainbox::touchpad
-id: touchpad/singletouch-corner
-requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-estimated_duration: 120.0
-_purpose:
- Determine that the hot corner feature is working as expected
-_steps:
- 1. Launch a browser.
- 2. Go to a website, and hover the cursor over a link.
- 3. Tap the upper right corner on the touchpad.
-_verification:
- Did the tap trigger a new tab to be opened?
-
-plugin: manual
-category_id: com.canonical.plainbox::touchpad
 id: touchpad/singletouch-selection
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
 estimated_duration: 120.0
@@ -124,7 +87,6 @@ plugin: manual
 category_id: com.canonical.plainbox::touchpad
 id: touchpad/multitouch-rightclick
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-depends: touchpad/multitouch-automated
 estimated_duration: 120.0
 _purpose:
 Determine that the right click function is working as expected.
@@ -193,7 +155,6 @@ plugin: manual
 category_id: com.canonical.plainbox::touchpad
 id: touchpad/multitouch-zoom
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-depends: touchpad/multitouch-automated
 estimated_duration: 120.0
 _summary: Check touchpad pinch-to-zoom gesture
 _purpose:
@@ -209,7 +170,6 @@ plugin: manual
 category_id: com.canonical.plainbox::touchpad
 id: touchpad/multitouch-dash
 requires: dmi.product in ['Notebook','Laptop','Portable','Convertible']
-depends: touchpad/multitouch-automated
 estimated_duration: 120.0
 _summary: Check 4-finger tap gesture
 _purpose:
diff --git a/units/touchpad/test-plan.pxu b/units/touchpad/test-plan.pxu
index 78d7fa6..20da6c5 100644
--- a/units/touchpad/test-plan.pxu
+++ b/units/touchpad/test-plan.pxu
@@ -34,8 +34,6 @@ _description:
 Touchpad tests (Automated)
 include:
 touchpad/detected-as-mouse certification-status=blocker
- touchpad/singletouch-automated certification-status=blocker
- touchpad/multitouch-automated certification-status=blocker
 
 
 id: after-suspend-touchpad-cert-full
@@ -49,10 +47,8 @@ include:
 touchpad/continuous-move-after-suspend certification-status=blocker
 touchpad/horizontal-after-suspend certification-status=blocker
 touchpad/vertical-after-suspend certification-status=blocker
- touchpad/singletouch-automated-after-suspend certification-status=blocker
 touchpad/singletouch-selection-after-suspend certification-status=blocker
 touchpad/drag-and-drop-after-suspend certification-status=blocker
- touchpad/multitouch-automated-after-suspend certification-status=blocker
 touchpad/multitouch-manual-after-suspend certification-status=blocker
 touchpad/multitouch-rightclick-after-suspend certification-status=blocker
 touchpad/multitouch-horizontal-after-suspend certification-status=blocker
@@ -69,10 +65,8 @@ include:
 touchpad/continuous-move certification-status=blocker
 touchpad/horizontal certification-status=blocker
 touchpad/vertical certification-status=blocker
- touchpad/singletouch-automated certification-status=blocker
 touchpad/singletouch-selection certification-status=blocker
 touchpad/drag-and-drop certification-status=blocker
- touchpad/multitouch-automated certification-status=blocker
 touchpad/multitouch-manual certification-status=blocker
 touchpad/multitouch-rightclick certification-status=blocker
 touchpad/multitouch-horizontal certification-status=blocker
@@ -88,10 +82,8 @@ include:
 touchpad/continuous-move-after-suspend certification-status=blocker
 touchpad/horizontal-after-suspend certification-status=blocker
 touchpad/vertical-after-suspend certification-status=blocker
- touchpad/singletouch-automated-after-suspend certification-status=blocker
 touchpad/singletouch-selection-after-suspend certification-status=blocker
 touchpad/drag-and-drop-after-suspend certification-status=blocker
- touchpad/multitouch-automated-after-suspend certification-status=blocker
 touchpad/multitouch-manual-after-suspend certification-status=blocker
 touchpad/multitouch-rightclick-after-suspend certification-status=blocker
 touchpad/multitouch-horizontal-after-suspend certification-status=blocker