summaryrefslogtreecommitdiff
diff options
Diffstat
-rw-r--r--units/cpu/jobs.pxu9
-rw-r--r--units/firmware/jobs.pxu10
-rw-r--r--units/miscellanea/jobs.pxu12
-rw-r--r--units/power-management/jobs.pxu11
-rw-r--r--units/stress/jobs.pxu10
-rw-r--r--units/suspend/suspend.pxu3
6 files changed, 20 insertions, 35 deletions
diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu
index bdea273..bf23af7 100644
--- a/units/cpu/jobs.pxu
+++ b/units/cpu/jobs.pxu
@@ -2,8 +2,7 @@ plugin: shell
category_id: com.canonical.plainbox::cpu
id: cpu/scaling_test
estimated_duration: 150.0
-requires:
- package.name == 'fwts' or executable.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
environ: PLAINBOX_SESSION_SHARE LD_LIBRARY_PATH SNAP
command:
@@ -32,8 +31,7 @@ plugin: shell
category_id: com.canonical.plainbox::cpu
id: cpu/maxfreq_test
estimated_duration: 0.6
-requires:
- package.name == 'fwts' or executable.name == 'fwts'
+requires: executable.name == 'fwts'
cpuinfo.platform in ("i386", "x86_64")
user: root
environ: LD_LIBRARY_PATH SNAP
@@ -117,8 +115,7 @@ _description:
plugin:shell
id: cpu/cstates
estimated_duration: 10.0
-requires:
- package.name == 'fwts' or executable.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
_summary:
Run C-States tests
diff --git a/units/firmware/jobs.pxu b/units/firmware/jobs.pxu
index 3095273..5c8dcee 100644
--- a/units/firmware/jobs.pxu
+++ b/units/firmware/jobs.pxu
@@ -4,7 +4,7 @@ plugin: shell
category_id: com.canonical.plainbox::firmware
id: firmware/fwts_{name}
estimated_duration: 1.2
-requires: package.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
command: checkbox-support-fwts_test -t {name} -l $PLAINBOX_SESSION_SHARE/fwts_{name}.log
_description: Run {name} test from Firmware Test Suite.
@@ -16,7 +16,7 @@ plugin: attachment
category_id: com.canonical.plainbox::firmware
id: firmware/fwts_{name}.log
estimated_duration: 1.2
-requires: package.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
command: [[ -e $PLAINBOX_SESSION_SHARE/fwts_{name}.log ]] && xz -c $PLAINBOX_SESSION_SHARE/fwts_{name}.log
_description: Attach log for FWTS {name} test.
@@ -26,8 +26,7 @@ plugin:shell
category_id: com.canonical.plainbox::firmware
id: firmware/fwts_desktop_diagnosis
estimated_duration: 10.0
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
_description:
Run Firmware Test Suite (fwts) QA-concerned desktop-specific diagnosis tests.
@@ -40,8 +39,7 @@ plugin:shell
category_id: com.canonical.plainbox::firmware
id: firmware/fwts_desktop_diagnosis_hwe
estimated_duration: 5.0
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
_description:
Run Firmware Test Suite (fwts) HWE-concerned desktop-specific diagnosis tests.
diff --git a/units/miscellanea/jobs.pxu b/units/miscellanea/jobs.pxu
index 10df43d..2071f06 100644
--- a/units/miscellanea/jobs.pxu
+++ b/units/miscellanea/jobs.pxu
@@ -67,8 +67,7 @@ plugin: shell
category_id: com.canonical.plainbox::miscellanea
id: miscellanea/fwts_test
estimated_duration: 1.2
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
_description:
Run Firmware Test Suite (fwts) automated tests.
@@ -93,8 +92,7 @@ command: fwupdate -s
plugin: attachment
category_id: com.canonical.plainbox::miscellanea
id: miscellanea/fwts_results.log
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
command:
[[ -e ${PLAINBOX_SESSION_SHARE}/fwts_results.log ]] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_results.log
_description: Attaches the miscellanes/fwts_test results log to the submission.
@@ -103,8 +101,7 @@ plugin: attachment
category_id: com.canonical.plainbox::miscellanea
estimated_duration: 0.5
id: miscellanea/fwts_results_hwe.log.gz
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
command:
[ -f $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log
_description: Attaches the FWTS results log to the submission (to HWE)
@@ -292,8 +289,7 @@ _description:
plugin:shell
id: miscellanea/oops
estimated_duration: 10.0
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
_description:
Run Firmware Test Suite (fwts) oops tests.
diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu
index ce252fc..976f814 100644
--- a/units/power-management/jobs.pxu
+++ b/units/power-management/jobs.pxu
@@ -19,8 +19,7 @@ environ: PLAINBOX_SESSION_SHARE
estimated_duration: 25.0
user: root
_description: Test ACPI Wakealarm (fwts wakealarm)
-requires:
- package.name == 'fwts' or executable.name == 'fwts'
+requires: executable.name == 'fwts'
command: checkbox-support-fwts_test -f aborted -t wakealarm -l $PLAINBOX_SESSION_SHARE/fwts-wakealarm.log
plugin: attachment
@@ -38,8 +37,7 @@ estimated_duration: 120.0
depends: power-management/fwts_wakealarm
user: root
environ: PLAINBOX_SESSION_SHARE
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox poweroff --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn autorestart
_description:
@@ -61,8 +59,7 @@ id: power-management/reboot
estimated_duration: 120.0
user: root
environ: PLAINBOX_SESSION_SHARE
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
command: pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn autorestart
_description:
@@ -196,7 +193,7 @@ estimated_duration: 140.0
user: root
requires:
package.name == 'upower'
- package.name == 'fwts'
+ executable.name == 'fwts'
depends: power-management/unplug_ac
_description: Checks the battery drain during suspend. Reports time and capacity until empty.
command:
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index 2a2a7d0..b5bb254 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -222,8 +222,7 @@ plugin: shell
category_id: com.canonical.plainbox::stress
id: stress/reboot
estimated_duration: 4500.0
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 100 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn autorestart
user: root
@@ -243,8 +242,7 @@ command:
plugin: shell
category_id: com.canonical.plainbox::stress
id: stress/reboot_30
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
executable.name == 'x-terminal-emulator'
command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox -r 30 --silent --log-level=notset reboot --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn autorestart
@@ -267,7 +265,7 @@ category_id: com.canonical.plainbox::stress
id: stress/poweroff
estimated_duration: 4500.0
requires:
- package.name == 'fwts'
+ executable.name == 'fwts'
executable.name == 'x-terminal-emulator'
command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --r 100 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn autorestart
@@ -289,7 +287,7 @@ plugin: shell
category_id: com.canonical.plainbox::stress
id: stress/poweroff_30
requires:
- package.name == 'fwts'
+ executable.name == 'fwts'
executable.name == 'x-terminal-emulator'
command: pm_test --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --r 30 --silent --log-level=notset poweroff --log-dir=$PLAINBOX_SESSION_SHARE
flags: noreturn autorestart
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index 6704a2f..a862390 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -2292,8 +2292,7 @@ id: suspend/oops_after_suspend
depends: suspend/suspend_advanced
plugin:shell
estimated_duration: 10.0
-requires:
- package.name == 'fwts'
+requires: executable.name == 'fwts'
user: root
_description:
Run Firmware Test Suite (fwts) oops tests after suspend.
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-20 14:28:42 +0000