Checkbox IIoTG

Merge ~liaou3/checkbox-iiotg/+git/checkbox-iiotg:series_uc20 into ~liaou3/checkbox-iiotg/+git/checkbox-iiotg:master

  1. Git
  2. lp:~liaou3/checkbox-iiotg/+git/checkbox-iiotg
  3. series_uc20
  4. Merge into master
Proposed by Vincent Liao
Status: Superseded
Proposed branch: ~liaou3/checkbox-iiotg/+git/checkbox-iiotg:series_uc20
Merge into: ~liaou3/checkbox-iiotg/+git/checkbox-iiotg:master
Diff against target: 227 lines (+74/-2) (has conflicts)
8 files modified
config/config_vars (+8/-2)
launchers/test-runner (+8/-0)
launchers/test-runner-adl (+8/-0)
launchers/test-runner-ehl (+8/-0)
launchers/test-runner-icl (+8/-0)
launchers/test-runner-rpl (+8/-0)
launchers/test-runner-tgl (+8/-0)
snap/snapcraft.yaml (+18/-0)
Conflict in config/config_vars
Conflict in launchers/test-runner
Conflict in launchers/test-runner-adl
Conflict in launchers/test-runner-ehl
Conflict in launchers/test-runner-icl
Conflict in launchers/test-runner-rpl
Conflict in launchers/test-runner-tgl
Conflict in snap/snapcraft.yaml
Reviewer Review Type Date Requested Status
Vic Liu Pending
Review via email: mp+444696@code.launchpad.net

This proposal has been superseded by a proposal from 2023-06-14.

Description of the change

Fix and add the names in config.

To post a comment you must log in.

Unmerged commits

b896423... by Vincent Liao

Fix: Add and fix the name in config
1. rename WPA
2. Add WPA3
3. Add CYCLICTEST

0bebc02... by Ubuntu <email address hidden>

Merge #434964 from ~baconyao/checkbox-iiotg/+git/checkbox-iiotg:define-runner-serires20

Add: add test-runner for each CPU family

Add the test-runner for ehl, tgl, adl, icl and rpl CPU with
pre-defined manifest.

418029f... by Ubuntu <email address hidden>

Merge #434767 from ~baconyao/checkbox-iiotg/+git/checkbox-iiotg:extend-boot-wakeup-delay-uc20

Modify: Extend the duration of wakeup time

This is the temporary workaround for cold-reboot issue.

847a972... by Ubuntu <email address hidden>

Merge #434967 from ~baconyao/checkbox-iiotg/+git/checkbox-iiotg:watchdog-identity-series20

Add: New variable for watchdog identity

The identity of wdat_wdt module is same as its module name.

0394c30... by PeiYao Chang

Add: New variable for watchdog identity

The identity of wdat_wdt module is same as its module name.

1011e2b... by PeiYao Chang

Add: add test-runner for each CPU family

Add the test-runner for ehl, tgl, adl, icl and rpl CPU with
pre-defined manifest.

e4c0070... by PeiYao Chang

Modify: Extend the duration of wakeup time

This is the temporary workaround for cold-reboot issue.

35edbff... by Ubuntu <email address hidden>

Merge #433022 from ~zongminl/checkbox-iiotg/+git/checkbox-iiotg:focal-disable-slave

Change: Set snap config slave disabled

2685e50... by Vic Liu

Change: Set snap config slave disabled

f98e9de... by Ubuntu <email address hidden>

Merge #430613 from ~djacobs98/checkbox-iiotg/+git/checkbox-iiotg:wait_150_uc20

Modify: Change wait between reboot tests from 120 to 150 seconds.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config/config_vars b/config/config_vars
2index 22488ac..01e51cb 100644
3--- a/config/config_vars
4+++ b/config/config_vars
5@@ -5,15 +5,17 @@ WIFI_INTERFACE=wlan0
6 OPEN_N_SSID=ubuntu-cert-n-open-tpelab
7 OPEN_BG_SSID=ubuntu-cert-bg-open-tpelab
8 OPEN_AC_SSID=ubuntu-cert-ac-open-tpelab
9-OPEN_AX_SSID=ubuntu-cert-ax-open
10+OPEN_AX_SSID=ubuntu-cert-ax-open-tpelab
11 WPA_N_SSID=ubuntu-cert-n-wpa-tpelab
12 WPA_BG_SSID=ubuntu-cert-bg-wpa-tpelab
13 WPA_AC_SSID=ubuntu-cert-ac-wpa-tpelab
14-WPA_AX_SSID=ubuntu-cert-ax-wpa
15+WPA_AX_SSID=ubuntu-cert-ax-wpa-tpelab
16+WPA3_AX_SSID=ubuntu-cert-ax-wpa3-tpelab
17 WPA_N_PSK=insecure
18 WPA_BG_PSK=insecure
19 WPA_AC_PSK=insecure
20 WPA_AX_PSK=insecure
21+WPA3_AX_PSK=insecure
22 BTDEVADDR=C0:B5:D7:C1:74:38
23 # obex server in office: C0:B5:D7:C1:74:38
24 # obex server in lab: 28:3A:4D:46:79:C0, 7C:B2:7D:4B:14:95
25@@ -39,3 +41,7 @@ TPM2TOOLS_DEVICE_FILE=/dev/tpm0
26 MODEL_GRADE=signed
27 WATCHDOG_TYPE=wdat_wdt
28 WATCHDOG_IDENTITY=wdat_wdt
29+<<<<<<< config/config_vars
30+=======
31+CYCLICTEST_DURATION=86400
32+>>>>>>> config/config_vars
33diff --git a/launchers/test-runner b/launchers/test-runner
34index 45060fc..33c1db7 100755
35--- a/launchers/test-runner
36+++ b/launchers/test-runner
37@@ -5,9 +5,17 @@ launcher_version = 1
38 stock_reports = text, submission_files, certification
39
40 [test plan]
41+<<<<<<< launchers/test-runner
42 unit = com.canonical.qa.intliotg::intliotg-ubuntucore-22
43 filter = com.canonical.qa.intliotg::intliotg-ubuntucore-22
44 com.canonical.qa.intliotg::intliotg-ubuntucore-22-manual
45 com.canonical.qa.intliotg::intliotg-ubuntucore-22-automated
46 com.canonical.qa.intliotg::intliotg-ubuntucore-22-stress
47+=======
48+unit = com.canonical.qa.intliotg::intliotg-ubuntucore-20
49+filter = com.canonical.qa.intliotg::intliotg-ubuntucore-20
50+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-manual
51+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-automated
52+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-stress
53+>>>>>>> launchers/test-runner
54
55diff --git a/launchers/test-runner-adl b/launchers/test-runner-adl
56index a44daaa..a444b82 100755
57--- a/launchers/test-runner-adl
58+++ b/launchers/test-runner-adl
59@@ -5,11 +5,19 @@ launcher_version = 1
60 stock_reports = text, submission_files, certification
61
62 [test plan]
63+<<<<<<< launchers/test-runner-adl
64 unit = com.canonical.qa.intliotg::intliotg-ubuntucore-22
65 filter = com.canonical.qa.intliotg::intliotg-ubuntucore-22
66 com.canonical.qa.intliotg::intliotg-ubuntucore-22-manual
67 com.canonical.qa.intliotg::intliotg-ubuntucore-22-automated
68 com.canonical.qa.intliotg::intliotg-ubuntucore-22-stress
69+=======
70+unit = com.canonical.qa.intliotg::intliotg-ubuntucore-20
71+filter = com.canonical.qa.intliotg::intliotg-ubuntucore-20
72+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-manual
73+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-automated
74+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-stress
75+>>>>>>> launchers/test-runner-adl
76
77 [manifest]
78 com.canonical.certification::has_card_reader= false
79diff --git a/launchers/test-runner-ehl b/launchers/test-runner-ehl
80index ddfc22c..93c11a3 100755
81--- a/launchers/test-runner-ehl
82+++ b/launchers/test-runner-ehl
83@@ -5,11 +5,19 @@ launcher_version = 1
84 stock_reports = text, submission_files, certification
85
86 [test plan]
87+<<<<<<< launchers/test-runner-ehl
88 unit = com.canonical.qa.intliotg::intliotg-ubuntucore-22
89 filter = com.canonical.qa.intliotg::intliotg-ubuntucore-22
90 com.canonical.qa.intliotg::intliotg-ubuntucore-22-manual
91 com.canonical.qa.intliotg::intliotg-ubuntucore-22-automated
92 com.canonical.qa.intliotg::intliotg-ubuntucore-22-stress
93+=======
94+unit = com.canonical.qa.intliotg::intliotg-ubuntucore-20
95+filter = com.canonical.qa.intliotg::intliotg-ubuntucore-20
96+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-manual
97+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-automated
98+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-stress
99+>>>>>>> launchers/test-runner-ehl
100
101 [manifest]
102 com.canonical.certification::has_audio_capture= false
103diff --git a/launchers/test-runner-icl b/launchers/test-runner-icl
104index f82e1ea..54d35ab 100755
105--- a/launchers/test-runner-icl
106+++ b/launchers/test-runner-icl
107@@ -5,11 +5,19 @@ launcher_version = 1
108 stock_reports = text, submission_files, certification
109
110 [test plan]
111+<<<<<<< launchers/test-runner-icl
112 unit = com.canonical.qa.intliotg::intliotg-ubuntucore-22
113 filter = com.canonical.qa.intliotg::intliotg-ubuntucore-22
114 com.canonical.qa.intliotg::intliotg-ubuntucore-22-manual
115 com.canonical.qa.intliotg::intliotg-ubuntucore-22-automated
116 com.canonical.qa.intliotg::intliotg-ubuntucore-22-stress
117+=======
118+unit = com.canonical.qa.intliotg::intliotg-ubuntucore-20
119+filter = com.canonical.qa.intliotg::intliotg-ubuntucore-20
120+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-manual
121+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-automated
122+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-stress
123+>>>>>>> launchers/test-runner-icl
124
125 [manifest]
126 com.canonical.certification::has_audio_capture= false
127diff --git a/launchers/test-runner-rpl b/launchers/test-runner-rpl
128index e19c876..20da676 100755
129--- a/launchers/test-runner-rpl
130+++ b/launchers/test-runner-rpl
131@@ -5,11 +5,19 @@ launcher_version = 1
132 stock_reports = text, submission_files, certification
133
134 [test plan]
135+<<<<<<< launchers/test-runner-rpl
136 unit = com.canonical.qa.intliotg::intliotg-ubuntucore-22
137 filter = com.canonical.qa.intliotg::intliotg-ubuntucore-22
138 com.canonical.qa.intliotg::intliotg-ubuntucore-22-manual
139 com.canonical.qa.intliotg::intliotg-ubuntucore-22-automated
140 com.canonical.qa.intliotg::intliotg-ubuntucore-22-stress
141+=======
142+unit = com.canonical.qa.intliotg::intliotg-ubuntucore-20
143+filter = com.canonical.qa.intliotg::intliotg-ubuntucore-20
144+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-manual
145+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-automated
146+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-stress
147+>>>>>>> launchers/test-runner-rpl
148
149 [manifest]
150 com.canonical.certification::has_audio_capture= true
151diff --git a/launchers/test-runner-tgl b/launchers/test-runner-tgl
152index 5182fe4..cd91375 100755
153--- a/launchers/test-runner-tgl
154+++ b/launchers/test-runner-tgl
155@@ -5,11 +5,19 @@ launcher_version = 1
156 stock_reports = text, submission_files, certification
157
158 [test plan]
159+<<<<<<< launchers/test-runner-tgl
160 unit = com.canonical.qa.intliotg::intliotg-ubuntucore-22
161 filter = com.canonical.qa.intliotg::intliotg-ubuntucore-22
162 com.canonical.qa.intliotg::intliotg-ubuntucore-22-manual
163 com.canonical.qa.intliotg::intliotg-ubuntucore-22-automated
164 com.canonical.qa.intliotg::intliotg-ubuntucore-22-stress
165+=======
166+unit = com.canonical.qa.intliotg::intliotg-ubuntucore-20
167+filter = com.canonical.qa.intliotg::intliotg-ubuntucore-20
168+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-manual
169+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-automated
170+ com.canonical.qa.intliotg::intliotg-ubuntucore-20-stress
171+>>>>>>> launchers/test-runner-tgl
172
173 [manifest]
174 com.canonical.certification::has_audio_capture= true
175diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
176index c0b5101..b5cf3c0 100644
177--- a/snap/snapcraft.yaml
178+++ b/snap/snapcraft.yaml
179@@ -2,7 +2,11 @@ name: checkbox-iiotg
180 summary: Checkbox tests for the iiotg project
181 description: |
182 Collection of tests to be run on devices that are part of the iiotg project
183+<<<<<<< snap/snapcraft.yaml
184 version: '0.1dev-jammy'
185+=======
186+version: '0.1dev-focal'
187+>>>>>>> snap/snapcraft.yaml
188 confinement: strict
189 grade: stable
190
191@@ -69,14 +73,24 @@ apps:
192 command-chain: [bin/wrapper_local]
193 command: bin/test-runner-tgl
194 plugs: *standard
195+<<<<<<< snap/snapcraft.yaml
196 test-runner-icl:
197 command-chain: [bin/wrapper_local]
198 command: bin/test-runner-icl
199 plugs: *standard
200+=======
201+>>>>>>> snap/snapcraft.yaml
202 test-runner-adl:
203 command-chain: [bin/wrapper_local]
204 command: bin/test-runner-adl
205 plugs: *standard
206+<<<<<<< snap/snapcraft.yaml
207+=======
208+ test-runner-icl:
209+ command-chain: [bin/wrapper_local]
210+ command: bin/test-runner-icl
211+ plugs: *standard
212+>>>>>>> snap/snapcraft.yaml
213 test-runner-rpl:
214 command-chain: [bin/wrapper_local]
215 command: bin/test-runner-rpl
216@@ -89,7 +103,11 @@ passthrough:
217
218 parts:
219 checkbox-provider-intliotg:
220+<<<<<<< snap/snapcraft.yaml
221 plugin: dump
222+=======
223+ plugin: checkbox-provider
224+>>>>>>> snap/snapcraft.yaml
225 source: https://git.launchpad.net/~checkbox-dev/checkbox-iiotg/+git/checkbox-provider-intliotg
226 source-type: git
227 stage-packages:

Subscribers

People subscribed via source and target branches

to all changes: