Merge ~liaou3/checkbox-limerick/+git/checkbox-provider-limerick:replace_wol_s3 into ~checkbox-dev/checkbox-limerick/+git/checkbox-provider-limerick:master

Proposed by Vincent Liao
Status: Merged
Approved by: Vincent Liao
Approved revision: 16010e64a1273cdb2fac13bc0c26236d2fa63993
Merged at revision: 643e6573c05c33c92e7eecab8158938a5c8debd6
Proposed branch: ~liaou3/checkbox-limerick/+git/checkbox-provider-limerick:replace_wol_s3
Merge into: ~checkbox-dev/checkbox-limerick/+git/checkbox-provider-limerick:master
Diff against target: 120 lines (+54/-0)
6 files modified
units/ethernet/category.pxu (+3/-0)
units/ethernet/jobs.pxu (+37/-0)
units/ethernet/testplan.pxu (+8/-0)
units/kd240-test-plan-classic.pxu (+2/-0)
units/kr260-test-plan-classic.pxu (+2/-0)
units/kv260-test-plan-classic.pxu (+2/-0)
Reviewer Review Type Date Requested Status
Rick Wu Approve
PeiYao Chang Approve
Weichen Wu Pending
StanleyHuang Pending
Vic Liu Pending
Review via email: mp+463263@code.launchpad.net

Commit message

Replace with new wol_s3 tests

Description of the change

Since to test wol needs pre-setting which is quite annoying, I create a new test with those pre-setting steps run automatically before starting the test.

Submission: https://certification.canonical.com/hardware/202307-31903/submission/362351/

To post a comment you must log in.
Revision history for this message
PeiYao Chang (baconyao) wrote :

See my inline comment

review: Needs Fixing
Revision history for this message
Vincent Liao (liaou3) wrote :

> See my inline comment
Fixed

Revision history for this message
Vincent Liao (liaou3) wrote :

> See my inline comment
Fixed

Revision history for this message
PeiYao Chang (baconyao) wrote :

+1

review: Approve
Revision history for this message
Rick Wu (rickwu4444) wrote :

Please see my inline comment

review: Needs Fixing
Revision history for this message
Rick Wu (rickwu4444) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/units/ethernet/category.pxu b/units/ethernet/category.pxu
0new file mode 1006440new file mode 100644
index 0000000..79c3e2e
--- /dev/null
+++ b/units/ethernet/category.pxu
@@ -0,0 +1,3 @@
1unit: category
2id: limerick-ethernet
3_name: Limerick Ethernet
diff --git a/units/ethernet/jobs.pxu b/units/ethernet/jobs.pxu
0new file mode 1006444new file mode 100644
index 0000000..68fe706
--- /dev/null
+++ b/units/ethernet/jobs.pxu
@@ -0,0 +1,37 @@
1unit: template
2template-engine: jinja2
3template-resource: com.canonical.certification::device
4template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN' # Remove device.mac != 'UNKNOWN', due to LP#2009577
5template-id: limerick-ethernet/wol_S3_tests
6_template-summary: Wake on lan testing on Limerick devices
7id: limerick-ethernet/wol_S3_{{ interface }}
8_summary: Wake on LAN (WOL) test from S3 - {{ interface }}
9_purpose:
10 Check that another system can wake up from S3 the SUT using ethernet port {{ interface }} WOL function.
11_steps:
12 1. Ensure there is an ethernet cable attached to port {{ interface }}.
13 2. Press Enter to suspend the system.
14 3. From another computer on the same network run the following command:
15 ping {DUT_IP} -> provided in the job output
16_verification:
17 Did the SUT wake up from S3?
18plugin: user-interact-verify
19imports:
20 from com.canonical.certification import sleep
21requires:
22 sleep.mem == 'supported'
23command:
24 echo "Wake up sources:"
25 wakeup_sources=$(find /sys/ | grep /power/wakeup\$ | grep {{ interface }})
26 echo "$wakeup_sources"
27 for device in $wakeup_sources; do
28 echo enabled > "$device"
29 done
30 echo "Set wol 'a' on {{ interface }}"
31 ethtool -s {{ interface }} wol a
32 ip=$(ip -4 addr show {{ interface }} | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
33 echo "ip: $ip"
34 systemctl suspend
35user: root
36category_id: limerick-ethernet
37estimated_duration: 60
diff --git a/units/ethernet/testplan.pxu b/units/ethernet/testplan.pxu
0new file mode 10064438new file mode 100644
index 0000000..6609426
--- /dev/null
+++ b/units/ethernet/testplan.pxu
@@ -0,0 +1,8 @@
1id: limerick-ethernet-manual
2unit: test plan
3_name: Limerick Manual Ethernet Tests
4_description: Manual ethernet test
5include:
6 limerick-ethernet/wol_S3_tests
7bootstrap_include:
8 com.canonical.certification::device
diff --git a/units/kd240-test-plan-classic.pxu b/units/kd240-test-plan-classic.pxu
index f97200a..4d8f524 100644
--- a/units/kd240-test-plan-classic.pxu
+++ b/units/kd240-test-plan-classic.pxu
@@ -27,7 +27,9 @@ nested_part:
27 com.canonical.qa.ceoem::ce-oem-manual27 com.canonical.qa.ceoem::ce-oem-manual
28 com.canonical.certification::client-cert-iot-server-22-04-manual28 com.canonical.certification::client-cert-iot-server-22-04-manual
29 com.canonical.qa.ceoem::after-suspend-ce-oem-manual29 com.canonical.qa.ceoem::after-suspend-ce-oem-manual
30 limerick-ethernet-manual
30exclude:31exclude:
32 com.canonical.certification::ethernet/wol_S3_.* # LP:1982453 Since wol on limerick devices needs pre-setting, we replace it with limerick-ethernet/wol_S3_.*
31 com.canonical.certification::ethernet/wol_S5_.* # LP:201748133 com.canonical.certification::ethernet/wol_S5_.* # LP:2017481
32 com.canonical.certification::rtc/battery # LP:201748634 com.canonical.certification::rtc/battery # LP:2017486
3335
diff --git a/units/kr260-test-plan-classic.pxu b/units/kr260-test-plan-classic.pxu
index 548e239..76688c5 100644
--- a/units/kr260-test-plan-classic.pxu
+++ b/units/kr260-test-plan-classic.pxu
@@ -33,6 +33,7 @@ nested_part:
33 limerick-after-suspend-monitor-manual33 limerick-after-suspend-monitor-manual
34 com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-manual34 com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-manual
35 limerick-usb-manual35 limerick-usb-manual
36 limerick-ethernet-manual
36exclude:37exclude:
37 com.canonical.certification::audio.* # keep if audio is not supported38 com.canonical.certification::audio.* # keep if audio is not supported
38 com.canonical.certification::bluetooth.* # keep if bluetooth is not supported39 com.canonical.certification::bluetooth.* # keep if bluetooth is not supported
@@ -57,6 +58,7 @@ exclude:
57 com.canonical.certification::after-suspend.*wwan.* # keep if post-suspend wwan/4G/5G is not supported58 com.canonical.certification::after-suspend.*wwan.* # keep if post-suspend wwan/4G/5G is not supported
58 com.canonical.certification::ethernet/wol_S5_.*59 com.canonical.certification::ethernet/wol_S5_.*
59 com.canonical.certification::ethernet/wol_S4_.*60 com.canonical.certification::ethernet/wol_S4_.*
61 com.canonical.certification::ethernet/wol_S3_.* # LP:1982453 Since wol on limerick devices needs pre-setting, we replace it with limerick-ethernet/wol_S3_.*
60 com.canonical.certification::graphics/1_glxgears_.*62 com.canonical.certification::graphics/1_glxgears_.*
61 com.canonical.certification::graphics/1_video_.*63 com.canonical.certification::graphics/1_video_.*
62 com.canonical.certification::graphics/1_rotation_.*64 com.canonical.certification::graphics/1_rotation_.*
diff --git a/units/kv260-test-plan-classic.pxu b/units/kv260-test-plan-classic.pxu
index cf58bba..849d63a 100644
--- a/units/kv260-test-plan-classic.pxu
+++ b/units/kv260-test-plan-classic.pxu
@@ -43,6 +43,7 @@ nested_part:
43 limerick-after-suspend-monitor-manual43 limerick-after-suspend-monitor-manual
44 com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-manual44 com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-manual
45 limerick-usb-manual45 limerick-usb-manual
46 limerick-ethernet-manual
46exclude:47exclude:
47 com.canonical.certification::audio.* # keep if audio is not supported48 com.canonical.certification::audio.* # keep if audio is not supported
48 com.canonical.certification::bluetooth.* # keep if bluetooth is not supported49 com.canonical.certification::bluetooth.* # keep if bluetooth is not supported
@@ -67,6 +68,7 @@ exclude:
67 com.canonical.certification::after-suspend.*wwan.* # keep if post-suspend wwan/4G/5G is not supported68 com.canonical.certification::after-suspend.*wwan.* # keep if post-suspend wwan/4G/5G is not supported
68 com.canonical.certification::ethernet/wol_S5_.*69 com.canonical.certification::ethernet/wol_S5_.*
69 com.canonical.certification::ethernet/wol_S4_.*70 com.canonical.certification::ethernet/wol_S4_.*
71 com.canonical.certification::ethernet/wol_S3_.* # LP:1982453 Since wol on limerick devices needs pre-setting, we replace it with limerick-ethernet/wol_S3_.*
70 com.canonical.certification::graphics/1_glxgears_.*72 com.canonical.certification::graphics/1_glxgears_.*
71 com.canonical.certification::graphics/1_video_.*73 com.canonical.certification::graphics/1_video_.*
72 com.canonical.certification::graphics/1_rotation_.*74 com.canonical.certification::graphics/1_rotation_.*

Subscribers

People subscribed via source and target branches