Checkbox Provider - Base

Merge ~sylvain-pineau/plainbox-provider-checkbox/+git/packaging:remove-python3-guacamole into plainbox-provider-checkbox:master

  1. Git
  2. lp:~sylvain-pineau/plainbox-provider-checkbox/+git/packaging
  3. remove-python3-guacamole
  4. Merge into master
Proposed by Sylvain Pineau
Status: Superseded
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox/+git/packaging:remove-python3-guacamole
Merge into: plainbox-provider-checkbox:master
Diff against target: 1326 lines (+785/-0) (has conflicts)
30 files modified
bin/ipmi_test.py (+4/-0)
bin/kernel_taint_test.py (+64/-0)
bin/wwan_tests.py (+41/-0)
debian/.git-dpm (+8/-0)
debian/changelog (+194/-0)
debian/compat (+1/-0)
debian/control (+68/-0)
debian/copyright (+96/-0)
debian/rules (+23/-0)
debian/source/format (+1/-0)
debian/source/lintian-overrides (+2/-0)
debian/upstream/signing-key.asc (+119/-0)
debian/watch (+4/-0)
manage.py (+4/-0)
units/bluetooth/jobs.pxu (+4/-0)
units/cpu/test-plan.pxu (+6/-0)
units/ethernet/test-plan.pxu (+3/-0)
units/fingerprint/test-plan.pxu (+14/-0)
units/gpio/test-plan.pxu (+3/-0)
units/info/jobs.pxu (+4/-0)
units/led/test-plan.pxu (+5/-0)
units/miscellanea/test-plan.pxu (+8/-0)
units/mobilebroadband/test-plan.pxu (+6/-0)
units/networking/test-plan.pxu (+16/-0)
units/power-management/test-plan.pxu (+18/-0)
units/suspend/suspend.pxu (+8/-0)
units/ubuntucore/jobs.pxu (+11/-0)
units/watchdog/jobs.pxu (+29/-0)
units/wireless/jobs.pxu (+3/-0)
units/wireless/test-plan.pxu (+18/-0)
Conflict in bin/ipmi_test.py
Conflict in bin/kernel_taint_test.py
Conflict in bin/wwan_tests.py
Conflict in manage.py
Conflict in units/bluetooth/jobs.pxu
Conflict in units/cpu/test-plan.pxu
Conflict in units/ethernet/test-plan.pxu
Conflict in units/fingerprint/test-plan.pxu
Conflict in units/gpio/test-plan.pxu
Conflict in units/info/jobs.pxu
Conflict in units/led/test-plan.pxu
Conflict in units/miscellanea/test-plan.pxu
Conflict in units/mobilebroadband/test-plan.pxu
Conflict in units/networking/test-plan.pxu
Conflict in units/power-management/test-plan.pxu
Conflict in units/suspend/suspend.pxu
Conflict in units/ubuntucore/jobs.pxu
Conflict in units/watchdog/jobs.pxu
Conflict in units/wireless/jobs.pxu
Conflict in units/wireless/test-plan.pxu
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+408730@code.launchpad.net

This proposal has been superseded by a proposal from 2021-09-16.

Description of the change

Remove what should be the last bit of python3-guacamole

To post a comment you must log in.

Unmerged commits

af2a539... by Sylvain Pineau

debian:control: remove python3-guacamole from deps

f34bad5... by PMR <pmr@pmr-lander>

change version to 0.59.0-1
"new upstream version"

fd1b485... by PMR <pmr@pmr-lander>

record new upstream branch created by importing plainbox-provider-checkbox_0.59.0.orig.tar.gz and merge it

367bac1... by PMR <pmr@pmr-lander>

Import plainbox-provider-checkbox_0.59.0.orig.tar.gz

6ea59d2... by PMR <pmr@pmr-lander>

change version to 0.59.0~rc1-1
"new upstream version"

e24158a... by PMR <pmr@pmr-lander>

Import plainbox-provider-checkbox_0.59.0~rc1.orig.tar.gz

203a373... by PMR <pmr@pmr-lander>

record new upstream branch created by importing plainbox-provider-checkbox_0.59.0~rc1.orig.tar.gz and merge it

f38c81f... by PMR <pmr@pmr-lander>

change version to 0.58.0-1
"new upstream version"

529c39e... by PMR <pmr@pmr-lander>

Import plainbox-provider-checkbox_0.58.0.orig.tar.gz

e93a70c... by PMR <pmr@pmr-lander>

record new upstream branch created by importing plainbox-provider-checkbox_0.58.0.orig.tar.gz and merge it

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/bin/ipmi_test.py b/bin/ipmi_test.py
index f481134..de6c955 100755
--- a/bin/ipmi_test.py
+++ b/bin/ipmi_test.py
@@ -73,7 +73,11 @@ class FreeIpmiTest:
73 # min. ipmi version to pass73 # min. ipmi version to pass
74 self._ipmi_ver = 2.074 self._ipmi_ver = 2.0
75 # subprocess call timeout (s)75 # subprocess call timeout (s)
76<<<<<<< bin/ipmi_test.py
76 self._subproc_timeout = 1577 self._subproc_timeout = 15
78=======
79 self._subproc_timeout = 10
80>>>>>>> bin/ipmi_test.py
77 # raised subproc exceptions to handle81 # raised subproc exceptions to handle
78 # (decoupled from self._process_exc())82 # (decoupled from self._process_exc())
79 self._sub_process_excs = (83 self._sub_process_excs = (
diff --git a/bin/kernel_taint_test.py b/bin/kernel_taint_test.py
index e8ddc2a..d701dac 100755
--- a/bin/kernel_taint_test.py
+++ b/bin/kernel_taint_test.py
@@ -44,10 +44,17 @@ def find_taints(taint_file):
44 f = open(taint_file, "r")44 f = open(taint_file, "r")
45 taints = int(f.read())45 taints = int(f.read())
46 except OSError:46 except OSError:
47<<<<<<< bin/kernel_taint_test.py
47 raise SystemExit(48 raise SystemExit(
48 "Kernel taint file ({}) not found!".format(taint_file))49 "Kernel taint file ({}) not found!".format(taint_file))
49 print("Kernel taint value is {}".format(taints))50 print("Kernel taint value is {}".format(taints))
50 return taints51 return taints
52=======
53 taints = -1
54 print("Kernel taint file ({}) not found!".format(taint_file))
55 print("Kernel taint value is {}".format(taints))
56 return(taints)
57>>>>>>> bin/kernel_taint_test.py
5158
5259
53def get_modules():60def get_modules():
@@ -57,7 +64,11 @@ def get_modules():
57 for line in lsmod_output:64 for line in lsmod_output:
58 if line and 'Module' not in line:65 if line and 'Module' not in line:
59 modules.append(line.split()[0])66 modules.append(line.split()[0])
67<<<<<<< bin/kernel_taint_test.py
60 return modules68 return modules
69=======
70 return(modules)
71>>>>>>> bin/kernel_taint_test.py
6172
6273
63def process_out_of_tree_modules(modules):74def process_out_of_tree_modules(modules):
@@ -68,7 +79,11 @@ def process_out_of_tree_modules(modules):
68 if not check_output(shlex.split(cmd),79 if not check_output(shlex.split(cmd),
69 universal_newlines=True):80 universal_newlines=True):
70 mod_list.append(mod)81 mod_list.append(mod)
82<<<<<<< bin/kernel_taint_test.py
71 return mod_list83 return mod_list
84=======
85 return(mod_list)
86>>>>>>> bin/kernel_taint_test.py
7287
7388
74def process_GPL_incompatible_modules(modules):89def process_GPL_incompatible_modules(modules):
@@ -80,11 +95,16 @@ def process_GPL_incompatible_modules(modules):
80 universal_newlines=True).strip()95 universal_newlines=True).strip()
81 if "GPL" not in license and "MIT" not in license:96 if "GPL" not in license and "MIT" not in license:
82 mod_list.append((mod, license))97 mod_list.append((mod, license))
98<<<<<<< bin/kernel_taint_test.py
83 return mod_list99 return mod_list
100=======
101 return(mod_list)
102>>>>>>> bin/kernel_taint_test.py
84103
85104
86def remove_ignored_modules(modules):105def remove_ignored_modules(modules):
87 # Remove modules we know will fail, but accept106 # Remove modules we know will fail, but accept
107<<<<<<< bin/kernel_taint_test.py
88 ignored_modules = ['icp',108 ignored_modules = ['icp',
89 'spl',109 'spl',
90 'zavl',110 'zavl',
@@ -94,11 +114,22 @@ def remove_ignored_modules(modules):
94 'znvpair',114 'znvpair',
95 'zunicode',115 'zunicode',
96 'zzstd']116 'zzstd']
117=======
118 ignored_modules = ['zfs',
119 'zunicode',
120 'zlua',
121 'zavl',
122 'icp',
123 'zcommon',
124 'znvpair',
125 'spl']
126>>>>>>> bin/kernel_taint_test.py
97 for ignore_mod in ignored_modules:127 for ignore_mod in ignored_modules:
98 try:128 try:
99 modules.remove(ignore_mod)129 modules.remove(ignore_mod)
100 except ValueError:130 except ValueError:
101 pass131 pass
132<<<<<<< bin/kernel_taint_test.py
102 return modules133 return modules
103134
104135
@@ -111,6 +142,13 @@ def main():
111 args = parser.parse_args()142 args = parser.parse_args()
112 taints = find_taints(args.taint_file)143 taints = find_taints(args.taint_file)
113144
145=======
146 return(modules)
147
148
149def report_failures(taints):
150 """Report the failure code and its meaning(s)."""
151>>>>>>> bin/kernel_taint_test.py
114 # Below meaning strings are taken from152 # Below meaning strings are taken from
115 # https://www.kernel.org/doc/html/latest/admin-guide/tainted-kernels.html153 # https://www.kernel.org/doc/html/latest/admin-guide/tainted-kernels.html
116 taint_meanings = ["proprietary module was loaded",154 taint_meanings = ["proprietary module was loaded",
@@ -159,6 +197,7 @@ def main():
159 print("* Out of Tree modules found, "197 print("* Out of Tree modules found, "
160 "but they are expected and OK")198 "but they are expected and OK")
161 else:199 else:
200<<<<<<< bin/kernel_taint_test.py
162 count += 1201 count += 1
163202
164 if count == 0:203 if count == 0:
@@ -168,6 +207,31 @@ def main():
168 return 0207 return 0
169 else:208 else:
170 return 1209 return 1
210=======
211 print("Taint bit value: {} ({})".format(i, taint_meanings[i]))
212 count += 1
213 if taints == 0:
214 print("No kernel taints detected.")
215
216 if taints and count == 0:
217 # we found only taint 11
218 return count
219 else:
220 return taints
221
222
223def main():
224 parser = ArgumentParser()
225 parser.add_argument('--taint-file',
226 default="/proc/sys/kernel/tainted",
227 help='The file that holds the taint information')
228 args = parser.parse_args()
229 taints = find_taints(args.taint_file)
230 if taints < 0:
231 return taints
232
233 return(report_failures(taints))
234>>>>>>> bin/kernel_taint_test.py
171235
172236
173if __name__ == '__main__':237if __name__ == '__main__':
diff --git a/bin/wwan_tests.py b/bin/wwan_tests.py
index a2af54e..cf5cfb6 100755
--- a/bin/wwan_tests.py
+++ b/bin/wwan_tests.py
@@ -43,6 +43,7 @@ MMModemCapability = {
43 'MM_MODEM_CAPABILITY_ANY': 0xFFFFFFFF}43 'MM_MODEM_CAPABILITY_ANY': 0xFFFFFFFF}
4444
4545
46<<<<<<< bin/wwan_tests.py
46def print_head(txt):47def print_head(txt):
47 print("##", txt, flush=True)48 print("##", txt, flush=True)
4849
@@ -54,6 +55,8 @@ def print_cmd(cmd):
54 print("+", cmd, flush=True)55 print("+", cmd, flush=True)
5556
5657
58=======
59>>>>>>> bin/wwan_tests.py
57class MMDbus():60class MMDbus():
58 def __init__(self):61 def __init__(self):
59 self._bus = dbus.SystemBus()62 self._bus = dbus.SystemBus()
@@ -240,6 +243,7 @@ class MMCLI():
240243
241244
242def _create_3gpp_connection(wwan_if, apn):245def _create_3gpp_connection(wwan_if, apn):
246<<<<<<< bin/wwan_tests.py
243 print_head("Creating 3GPP Connection")247 print_head("Creating 3GPP Connection")
244 cmd = ["nmcli", "c", "add",248 cmd = ["nmcli", "c", "add",
245 "con-name", GSM_CON_ID,249 "con-name", GSM_CON_ID,
@@ -289,6 +293,35 @@ def _ping_test(if_name):
289 print_cmd(cmd)293 print_cmd(cmd)
290 subprocess.call(cmd)294 subprocess.call(cmd)
291 print()295 print()
296=======
297 subprocess.check_call(["nmcli", "c", "add",
298 "con-name", GSM_CON_ID,
299 "type", "gsm",
300 "ifname", wwan_if,
301 "apn", apn])
302
303
304def _wwan_radio_on():
305 subprocess.check_call(["nmcli", "r", "wwan", "on"])
306
307
308def _wwan_radio_off():
309 subprocess.check_call(["nmcli", "r", "wwan", "off"])
310
311
312def _destroy_3gpp_connection():
313 subprocess.check_call(["nmcli", "c",
314 "delete", GSM_CON_ID])
315
316
317def _ping_test(if_name):
318 ret_code = 1
319 route = subprocess.call(["ip", "route", "add", TEST_IP, "dev", if_name])
320 if route == 0:
321 ret_code = subprocess.check_call(["ping", "-c", "4",
322 "-I", if_name, TEST_IP])
323 subprocess.call(["ip", "route", "del", TEST_IP, "dev", if_name])
324>>>>>>> bin/wwan_tests.py
292 return ret_code325 return ret_code
293326
294327
@@ -315,7 +348,11 @@ class ThreeGppConnection():
315 pass348 pass
316 _destroy_3gpp_connection()349 _destroy_3gpp_connection()
317 _wwan_radio_off()350 _wwan_radio_off()
351<<<<<<< bin/wwan_tests.py
318 sys.exit(ret_code)352 sys.exit(ret_code)
353=======
354 return ret_code
355>>>>>>> bin/wwan_tests.py
319356
320357
321class CountModems():358class CountModems():
@@ -367,7 +404,11 @@ class SimPresent():
367 mm = MMDbus()404 mm = MMDbus()
368 mm_id = mm.equipment_id_to_mm_id(args.hw_id)405 mm_id = mm.equipment_id_to_mm_id(args.hw_id)
369 if not mm.sim_present(mm_id):406 if not mm.sim_present(mm_id):
407<<<<<<< bin/wwan_tests.py
370 sys.exit(1)408 sys.exit(1)
409=======
410 return 1
411>>>>>>> bin/wwan_tests.py
371412
372413
373class SimInfo():414class SimInfo():
diff --git a/debian/.git-dpm b/debian/.git-dpm
374new file mode 100644415new file mode 100644
index 0000000..f270695
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
1# see git-dpm(1) from git-dpm package
2367bac112ba08007d31fdff293610f34a091642b
3367bac112ba08007d31fdff293610f34a091642b
4367bac112ba08007d31fdff293610f34a091642b
5367bac112ba08007d31fdff293610f34a091642b
6plainbox-provider-checkbox_0.59.0.orig.tar.gz
77ff2f32c74f3ee76406019087734f538aa160bc4
81747886
diff --git a/debian/changelog b/debian/changelog
0new file mode 1006449new file mode 100644
index 0000000..4baa83c
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,194 @@
1plainbox-provider-checkbox (0.59.0-1) UNRELEASED; urgency=medium
2
3 [ Pierre Equoy ]
4 * Open for development (remove this message before releasing)
5 * "new upstream version"
6 * "new upstream version"
7 * "new upstream version"
8
9 [ Sylvain Pineau ]
10 * "new upstream version"
11 * "new upstream version"
12 * "new upstream version"
13
14 [ Pierre Equoy ]
15 * "new upstream version"
16 * "new upstream version"
17
18 [ Sylvain Pineau ]
19 * "new upstream version"
20 * "new upstream version"
21 * "new upstream version"
22 * "new upstream version"
23 * "new upstream version"
24 * "new upstream version"
25 * "new upstream version"
26 * "new upstream version"
27 * "new upstream version"
28 * "new upstream version"
29 * "new upstream version"
30 * "new upstream version"
31 * "new upstream version"
32 * "new upstream version"
33 * "new upstream version"
34 * "new upstream version"
35 * "new upstream version"
36 * "new upstream version"
37 * "new upstream version"
38 * "new upstream version"
39 * "new upstream version"
40 * "new upstream version"
41 * "new upstream version"
42 * "new upstream version"
43 * "new upstream version"
44 * "new upstream version"
45 * "new upstream version"
46 * "new upstream version"
47 * "new upstream version"
48 * "new upstream version"
49 * "new upstream version"
50 * "new upstream version"
51 * "new upstream version"
52 * "new upstream version"
53 * "new upstream version"
54 * "new upstream version"
55 * "new upstream version"
56 * "new upstream version"
57
58 [ Jenkins ]
59 * "new upstream version"
60 * "new upstream version"
61 * "new upstream version"
62 * "new upstream version"
63 * "new upstream version"
64 * "new upstream version"
65 * "new upstream version"
66 * "new upstream version"
67 * "new upstream version"
68 * "new upstream version"
69 * "new upstream version"
70 * "new upstream version"
71 * "new upstream version"
72 * "new upstream version"
73 * "new upstream version"
74 * "new upstream version"
75 * "new upstream version"
76 * "new upstream version"
77 * "new upstream version"
78 * "new upstream version"
79 * "new upstream version"
80 * "new upstream version"
81 * "new upstream version"
82 * "new upstream version"
83 * "new upstream version"
84 * "new upstream version"
85 * "new upstream version"
86 * "new upstream version"
87
88 -- Jenkins <jenkins@open-joey-201506-18558.maas> Mon, 12 Jul 2021 14:58:12 +0000
89
90plainbox-provider-checkbox (0.31) unstable; urgency=medium
91
92 [ Pierre Equoy ]
93 * New upstream release
94
95 -- Pierre Equoy <pierre.equoy@canonical.com> Fri, 30 Sep 2016 15:18:21 +0800
96
97plainbox-provider-checkbox (0.25-1) unstable; urgency=medium
98
99 * New upstream maintenance release
100 * debian/watch: match new upstream tarball names
101 * debian/rules: simplify override_dh_auto_install since installation
102 directories are all named plainbox-provider-checkbox
103 * debian/control: remove python2.x, dh-python and obexd-client dependencies
104 * debian/patches: New patch to depends on kmod instead of module-init-tools.
105 (Closes: #811187)
106
107 -- Sylvain Pineau <sylvain.pineau@canonical.com> Fri, 15 Jan 2016 16:51:16 +0100
108
109plainbox-provider-checkbox (0.24-1) unstable; urgency=medium
110
111 * New upstream maintenance release
112 * debian/control: Depend on more recent version of python3-checkbox-support
113 and python3-plainbox.
114
115 -- Sylvain Pineau <sylvain.pineau@canonical.com> Thu, 07 Jan 2016 18:03:36 +0100
116
117plainbox-provider-checkbox (0.21.3-1) unstable; urgency=medium
118
119 * New upstream maintenance release:
120 https://launchpad.net/plainbox-provider-checkbox/+milestone/0.21.1
121 https://launchpad.net/plainbox-provider-checkbox/+milestone/0.21.2
122 https://launchpad.net/plainbox-provider-checkbox/+milestone/0.21.3
123
124 -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Tue, 04 Aug 2015 10:03:10 +0200
125
126plainbox-provider-checkbox (0.21-1) unstable; urgency=medium
127
128 * New upstream release
129 * debian/control: wrap-and-sort
130 * debian/rules: don't modify .pot/.po files present in the tree
131 * debian/rules: rewrite provider directories to use more friendly names
132 * debian/rules: disable strict validation
133 * debian/watch: quote the last dot of the URL pattern
134 * debian/upstream/signing-key.asc: add the public key of Sylvain
135 Pineau (using gpg --armor --export-options export-minimal --export
136 '7ED72CD1').
137 * debian/copyright: bump Canonical copyright
138 * debian/control: Use the new email address for the team
139 (checkbox-devel@lists.ubuntu.com).
140 * debian/control: Depend on more recent version of plainbox to get the
141 packaging meta-data unit which blocks validation.
142 * debian/control, debian/rules: Depend on python3-debian for plainbox
143 packaging system integration. Activate plainbox packaging integration
144 through "./manage.py packaging", "X-Plainbox-Provider: yes" and
145 ${plainbox:Depends} and similar. This lets plainbox look at packaging
146 meta-data units contained in the provider being packaged (at .txt.in, .txt
147 and .pxu files) and determine appropriate dependencies. This lessens the
148 maintenance burden on the package maintainer and shifts it onto the
149 upstream developers to provide accurate packaging meta-data for each
150 specific distribution. This also means that separate packaging for similar
151 distributions (Debian, Ubuntu and bleeding-edge Ubuntu PPA is far easier
152 to work with as bulk of the work is shared).
153 * debian/copyright: de-duplicate licenses, as reported by lintian
154 * debian/control: bump standards version to 3.9.6 (no change required)
155
156 -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Wed, 22 Jul 2015 17:10:33 +0200
157
158plainbox-provider-checkbox (0.4-1) unstable; urgency=medium
159
160 * New upstream release. List of bugfixes:
161 https://launchpad.net/plainbox-provider-checkbox/14.04/0.4
162 * debian/watch: look for new releases on launchpad
163 * debian/rules: stop using pybuild and use manage.py
164 {i18n,build,install,validate} instead. This also drops dependency on
165 python3-distutils-extra and replaces that with intltool
166 * debian/control: drop X-Python3-Version
167 * debian/control: make plainbox-provider-checkbox depend on python and
168 python2.7 (for some scripts) rather than suggesting them.
169 * debian/upstream/signing-key.asc: Use armoured gpg keys to avoid having to
170 keep binary files in Debian packaging. Also, replace that with my key
171 since I made the 0.3 release upstream.
172 * debian/source/lintian-overrides: add an override for warning about no
173 source for flash movie with reference to a bug report that discusses that
174 issue.
175 * debian/source/include-binaries: drop (no longer needed)
176 * debian/patches: drop (no longer needed)
177 * debian/plainbox-provider-checkbox.lintian-overrides: drop (no longer
178 needed)
179 * Stop being a python3 module, move to from DPMT to PAPT
180
181 -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Mon, 07 Apr 2014 19:00:31 +0200
182
183plainbox-provider-checkbox (0.3-2) unstable; urgency=low
184
185 * Patch the checkbox.provider file to add the version number, required by
186 plainbox >= 0.5.
187
188 -- Sylvain Pineau <sylvain.pineau@canonical.com> Tue, 28 Jan 2014 13:20:39 +0100
189
190plainbox-provider-checkbox (0.3-1) unstable; urgency=low
191
192 * Initial release (Closes: #735208)
193
194 -- Sylvain Pineau <sylvain.pineau@canonical.com> Wed, 22 Jan 2014 00:58:42 +0100
diff --git a/debian/compat b/debian/compat
0new file mode 100644195new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
19
diff --git a/debian/control b/debian/control
0new file mode 1006442new file mode 100644
index 0000000..a8a7306
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,68 @@
1Source: plainbox-provider-checkbox
2Section: utils
3Priority: optional
4Maintainer: Checkbox Developers <checkbox-devel@lists.ubuntu.com>
5Uploaders: Sylvain Pineau <sylvain.pineau@canonical.com>,
6 Zygmunt Krynicki <zygmunt.krynicki@canonical.com>,
7 Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
8Build-Depends: debhelper (>= 9),
9 intltool,
10 libasound2-dev,
11 plainbox-provider-resource-generic (>= 0.25),
12 python3,
13 python3-checkbox-support (>= 0.25),
14 python3-checkbox-ng,
15 python3-debian
16Standards-Version: 3.9.6
17Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/plainbox-provider-checkbox/trunk/
18Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/plainbox-provider-checkbox/trunk/
19Homepage: http://launchpad.net/plainbox-provider-checkbox
20
21Package: plainbox-provider-checkbox
22Architecture: any
23Depends: plainbox-provider-resource-generic (>= 0.25),
24 python3,
25 python3-checkbox-support (>= 0.25),
26 ${misc:Depends},
27 ${plainbox:Depends},
28 ${shlibs:Depends}
29Recommends: bonnie++,
30 curl,
31 ethtool,
32 gir1.2-cheese-3.0,
33 gir1.2-gst-plugins-base-1.0,
34 gir1.2-gstreamer-1.0,
35 gstreamer1.0-plugins-good,
36 gstreamer1.0-pulseaudio,
37 hdparm,
38 kmod,
39 libgstreamer1.0-0,
40 lshw,
41 pm-utils,
42 python3-apt,
43 python3-dbus,
44 python3-gi,
45 smartmontools,
46 sysstat,
47 ${plainbox:Recommends}
48Suggests: fswebcam,
49 fwts,
50 glmark2,
51 glmark2-es2,
52 gtkperf,
53 imagemagick,
54 mesa-utils,
55 obexftp,
56 render-bench,
57 stress,
58 wmctrl,
59 ${plainbox:Suggests}
60X-Plainbox-Provider: yes
61Description: CheckBox provider for PlainBox
62 This package provides the CheckBox jobs collection, i.e the hardware test
63 definitions and scripts originally included with CheckBox.
64 It is used together alongside with PlainBox.
65 .
66 Jobs are smallest units of testing that can be performed by PlainBox.
67 All jobs have an unique name. There are many types of jobs, some are fully
68 automated others are fully manual.
diff --git a/debian/copyright b/debian/copyright
0new file mode 10064469new file mode 100644
index 0000000..5d95625
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,96 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: plainbox-provider-checkbox
3Source: https://launchpad.net/checkbox
4
5Files: *
6Copyright: Copyright 2007-2016 Canonical Ltd.
7License: GPL-3
8
9Files: bin/alsa_info
10Copyright: Copyright (C) 2007 Free Software Foundation.
11License: GPL-2
12
13Files: bin/camera_test
14Copyright:
15 Copyright 2008-2012 Canonical Ltd.
16 .
17 The v4l2 ioctl code comes from the Python bindings for the v4l2
18 userspace api (http://pypi.python.org/pypi/v4l2):
19 Copyright (C) 1999-2009 the contributors
20 .
21 The JPEG metadata parser is a part of bfg-pages:
22 https://github.com/yphus/bfg-pages/blob/master/pages/getimageinfo.py
23 Copyright (C) Tim Hoffman
24License: GPL-3
25
26Files: bin/graphics_driver
27Copyright: Copyright (C) 2010-2012 Bryce W. Harrington All Rights Reserved.
28License: MIT
29 Permission is hereby granted, free of charge, to any person obtaining a copy
30 of this software and associated documentation files (the "Software"), to deal
31 in the Software without restriction, including without limitation the rights
32 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
33 copies of the Software, and to permit persons to whom the Software is
34 furnished to do so, subject to the following conditions:
35 .
36 The above copyright notice and this permission notice shall be included in
37 all copies or substantial portions of the Software.
38 .
39 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
40 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
41 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
42 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
43 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
44 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
45 THE SOFTWARE.
46
47Files: bin/mm-test
48Copyright:
49 Copyright (C) 2008 Novell, Inc.
50 Copyright (C) 2009 Red Hat, Inc.
51License: GPL-2
52
53Files: src/threaded_memtest.c
54Copyright: Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
55License: GPL-2
56
57Files: bin/disk_info
58Copyright:
59 Copyright (C) 2010-2013 by Cloud Computing Center for Mobile Applications
60 Industrial Technology Research Institute
61License: GPL-3
62
63License: GPL-2
64 This program is free software; you can redistribute it and/or modify
65 it under the terms of the GNU General Public License as published by
66 the Free Software Foundation; either version 2 of the License, or
67 (at your option) any later version.
68 .
69 This program is distributed in the hope that it will be useful,
70 but WITHOUT ANY WARRANTY; without even the implied warranty of
71 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
72 GNU General Public License for more details.
73 .
74 You should have received a copy of the GNU General Public License
75 along with this program; if not, write to the Free Software
76 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
77 .
78 On Debian-based systems the full text of the GPL, version 2, can be found at
79 /usr/share/common-licenses/GPL-2.
80
81License: GPL-3
82 This program is free software: you can redistribute it and/or modify
83 it under the terms of the GNU General Public License version 3,
84 as published by the Free Software Foundation.
85 .
86 This program is distributed in the hope that it will be useful,
87 but WITHOUT ANY WARRANTY; without even the implied warranty of
88 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
89 GNU General Public License for more details.
90 .
91 You should have received a copy of the GNU General Public License
92 along with this program. If not, see <http://www.gnu.org/licenses/>.
93 .
94 On Debian-based systems the full text of the GPL, version 3, can be found at
95 /usr/share/common-licenses/GPL-3.
96
diff --git a/debian/rules b/debian/rules
0new file mode 10075597new file mode 100755
index 0000000..85fafe2
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,23 @@
1#!/usr/bin/make -f
2
3%:
4 dh $@
5
6override_dh_auto_clean:
7 python3 manage.py clean
8
9override_dh_auto_build:
10 python3 manage.py build
11 python3 manage.py i18n --dont-update-pot --dont-merge-po
12
13override_dh_auto_test:
14 python3 manage.py validate --loose --legacy
15
16override_dh_auto_install:
17 python3 manage.py install \
18 --prefix=/usr --layout=unix \
19 --root=$(CURDIR)/debian/plainbox-provider-checkbox/
20
21override_dh_gencontrol:
22 python3 manage.py packaging
23 dh_gencontrol
diff --git a/debian/source/format b/debian/source/format
0new file mode 10064424new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
13.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
0new file mode 1006442new file mode 100644
index 0000000..f031478
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
1# https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1303919
2plainbox-provider-checkbox source: source-is-missing
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
0new file mode 1006443new file mode 100644
index 0000000..90eb450
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,119 @@
1-----BEGIN PGP PUBLIC KEY BLOCK-----
2Version: GnuPG v1
3
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
40xxGS57/Nmfbij8UuxgkLtw==
41=4Jty
42-----END PGP PUBLIC KEY BLOCK-----
43-----BEGIN PGP PUBLIC KEY BLOCK-----
44Version: GnuPG v1
45
46mQENBEvipr4BCADJdK7pAu7fEFyNCLdMULze97sVWWJ1bWkA/lMot14911EbyFr7
47pvi5uril4QT55d1AKfMXJ6HNtHtIHe/CF1ehEc5c7oA2c0IdeSR4F6JEbFSneORT
48OZtYAK3VdG53ywpyCqP2tzB/YrRhVO9qsc5fYEr0EpeqRkvB5ower2MUFvvM5PBZ
49a+0owzW9OnlSOqbrVPj9Wp1bn857j/WpJCrMbcJlPPWGyo4ambAQI4Rky+apeQM0
50L4QTjPMXIoHDQao/2XsSL75OBx5Bi81j1KoU56PvM9b4oWMOqDDolPHwZGJtCewl
51LJqfy1Oa68vN4MxDXFmGp7bFTCt8ZOup1AjlABEBAAG0LVN5bHZhaW4gUGluZWF1
52IDxzeWx2YWluLnBpbmVhdUBjYW5vbmljYWwuY29tPokBOAQTAQIAIgUCS+KmvgIb
53AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQdNV1zH7XLNGSgAgApgU9VUlp
54Rblw7WH7q8BueI4G5CRiIDt6PA866IhbtuKPHMhv8LUQCVavAtKWVlwx/wGS/+2y
55CKqTCRXFu52MomE+kSfEFnELMW8vwz3KG6NgUVIv8dFesf1Finc8Y9YQkUX/xWYV
56MYREz3rgDgGMgpWlMVq5/olqYMg1jc4yIKrbQGoFDvlgijzGwibh/V5NVPcuYrMK
57DvhnWGIEX4whP/hW/o7vPKC5qYznrGqRroLqsq1viGgeS7nK37vcgX+vYv5pzIDM
5873CqpAnISAyBpU5n/YHG4AmundrVHwdscY7u8l9Fn5XFEGhu6FxWQL2mAY/gvGPS
59fgxeZUWpB21WNrkBDQRL4qa+AQgAtAiq2zDF0hl2KnB/a16O5SyjDR5XJUcWJ9F/
60tFw0i3EXEYeYdCFHaTdFfDmdX+SyBPh4lJIJZCpFZZ7Akeb3qLDS/4oAAo4EcoeS
61pp47Mr1/eCahI9Pkwg073jqHSUAKQp6oPP/bvBzAqhl4ZkUyZQpjdy0/d5FO4OEa
62R91SCxNqBQOA+Z2rKL6gBwJYpMGMKC1bhfOCvD8eH7dN3PDMNnHoYSjJSy5di/Zu
63snrVR4MO63FpmSZ4r5eGjIaiBFxYXsitn2ilPOt2e0/Vo8QOJsOl+6bOkdn5jiNL
64n1fCvzadUXuEDTjj9+6UkCCLYRODeTrMM9XpNeAZZBSGVzuCgQARAQABiQEfBBgB
65AgAJBQJL4qa+AhsMAAoJEHTVdcx+1yzRcpEH/iZMQPFnnCj3LthOvCAVM/raO17h
66KshdrOMS53uI5NzeBnr+/0zGMehnYcpzLmrvHXM86lsUVSzfr/px/Ve3+8SR6qxy
67p5+PFsxbqh+DSkxnTfbIqHVBY4f7/nOQavI1rhj4JQzKiYLCvIhDMVQm/2ZKnsNB
68043MaDPi0SBLJmqZqFyH3CUE3B8JNi4i+nv7Vj37V4sL1yHwN+rmyDhZUUelO5Iw
69vrysE7eNqmhTtuV+tl5Oq2EEzYau+7u+/Kuo1JpFsamJ8xVIR2j9i/3m3LqOaVPo
70ExFTDCQAPTaRyLAvTFylsIUffsdIAsM8wJQnuO5EzlxbkId3aVOrJ/cb5to=
71=cQg/
72-----END PGP PUBLIC KEY BLOCK-----
73-----BEGIN PGP PUBLIC KEY BLOCK-----
74Version: SKS 1.1.5
75
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
117FHU=
118=UsyP
119-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
0new file mode 100644120new file mode 100644
index 0000000..f151ff1
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
1version=3
2opts=pgpsigurlmangle=s/$/.asc/ \
3 http://launchpad.net/plainbox-provider-checkbox/+download/ \
4 https://launchpad\.net/plainbox-provider-checkbox/.*/.*/\+download/plainbox-provider-checkbox-(.*).tar.gz
diff --git a/manage.py b/manage.py
index d404260..9329248 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,11 @@ from plainbox.provider_manager import N_
5setup(5setup(
6 name='plainbox-provider-checkbox',6 name='plainbox-provider-checkbox',
7 namespace='com.canonical.certification',7 namespace='com.canonical.certification',
8<<<<<<< manage.py
8 version="0.60.0.dev0",9 version="0.60.0.dev0",
10=======
11 version="0.59.0",
12>>>>>>> manage.py
9 description=N_("Checkbox provider"),13 description=N_("Checkbox provider"),
10 gettext_domain='plainbox-provider-checkbox',14 gettext_domain='plainbox-provider-checkbox',
11 strict=False, deprecated=False,15 strict=False, deprecated=False,
diff --git a/units/bluetooth/jobs.pxu b/units/bluetooth/jobs.pxu
index e1573b5..2fb5b44 100644
--- a/units/bluetooth/jobs.pxu
+++ b/units/bluetooth/jobs.pxu
@@ -4,7 +4,11 @@ category_id: com.canonical.plainbox::bluetooth
4_summary: Make sure at least one bluetooth device is detected4_summary: Make sure at least one bluetooth device is detected
5plugin: shell5plugin: shell
6command:6command:
7<<<<<<< units/bluetooth/jobs.pxu
7 bt_list_adapters.py && udev_resource.py -f BLUETOOTH8 bt_list_adapters.py && udev_resource.py -f BLUETOOTH
9=======
10 bt_list_adapters.py
11>>>>>>> units/bluetooth/jobs.pxu
8estimated_duration: 2s12estimated_duration: 2s
9flags: preserve-locale13flags: preserve-locale
10requires: manifest.has_bt_adapter14requires: manifest.has_bt_adapter
diff --git a/units/cpu/test-plan.pxu b/units/cpu/test-plan.pxu
index f649267..cd12c7b 100644
--- a/units/cpu/test-plan.pxu
+++ b/units/cpu/test-plan.pxu
@@ -14,6 +14,12 @@ _name: CPU tests (Manual)
14_description:14_description:
15 CPU tests (Manual)15 CPU tests (Manual)
16include:16include:
17<<<<<<< units/cpu/test-plan.pxu
18=======
19nested_part:
20 cpu-cert-automated
21
22>>>>>>> units/cpu/test-plan.pxu
1723
18id: cpu-cert-automated24id: cpu-cert-automated
19unit: test plan25unit: test plan
diff --git a/units/ethernet/test-plan.pxu b/units/ethernet/test-plan.pxu
index 8f4fac6..381429a 100644
--- a/units/ethernet/test-plan.pxu
+++ b/units/ethernet/test-plan.pxu
@@ -1,3 +1,4 @@
1<<<<<<< units/ethernet/test-plan.pxu
1id: ethernet-cert-full2id: ethernet-cert-full
2unit: test plan3unit: test plan
3_name: Ethernet tests4_name: Ethernet tests
@@ -33,6 +34,8 @@ include:
33bootstrap_include:34bootstrap_include:
34 device35 device
3536
37=======
38>>>>>>> units/ethernet/test-plan.pxu
36id: ethernet-full39id: ethernet-full
37unit: test plan40unit: test plan
38_name: QA tests for ethernet41_name: QA tests for ethernet
diff --git a/units/fingerprint/test-plan.pxu b/units/fingerprint/test-plan.pxu
index ed5ee9a..69ed46d 100644
--- a/units/fingerprint/test-plan.pxu
+++ b/units/fingerprint/test-plan.pxu
@@ -1,16 +1,27 @@
1id: fingerprint-full1id: fingerprint-full
2unit: test plan2unit: test plan
3<<<<<<< units/fingerprint/test-plan.pxu
3_name: QA tests for Fingerprint reader4_name: QA tests for Fingerprint reader
5=======
6_name: QA tests for fingerprint reader
7>>>>>>> units/fingerprint/test-plan.pxu
4_description: Fingerprint tests8_description: Fingerprint tests
5estimated_duration: 1m9estimated_duration: 1m
6include:10include:
7nested_part:11nested_part:
8 fingerprint-manual12 fingerprint-manual
13<<<<<<< units/fingerprint/test-plan.pxu
9 fingerprint-automated14 fingerprint-automated
1015
11id: fingerprint-manual16id: fingerprint-manual
12unit: test plan17unit: test plan
13_name: Fingerprint reader tests (Manual)18_name: Fingerprint reader tests (Manual)
19=======
20
21id: fingerprint-manual
22unit: test plan
23_name: Manual fingerprint tests
24>>>>>>> units/fingerprint/test-plan.pxu
14_description: Manual tests for fingerprint reader25_description: Manual tests for fingerprint reader
15include:26include:
16 fingerprint/detect certification-status=non-blocker27 fingerprint/detect certification-status=non-blocker
@@ -19,9 +30,12 @@ include:
19 fingerprint/verify-match certification-status=non-blocker30 fingerprint/verify-match certification-status=non-blocker
20 fingerprint/unlock certification-status=non-blocker31 fingerprint/unlock certification-status=non-blocker
21 fingerprint/delete certification-status=non-blocker32 fingerprint/delete certification-status=non-blocker
33<<<<<<< units/fingerprint/test-plan.pxu
2234
23id: fingerprint-automated35id: fingerprint-automated
24unit: test plan36unit: test plan
25_name: Fingerprint reader tests (Automated)37_name: Fingerprint reader tests (Automated)
26_description: Autoamted tests for fingerprint reader38_description: Autoamted tests for fingerprint reader
27include:39include:
40=======
41>>>>>>> units/fingerprint/test-plan.pxu
diff --git a/units/gpio/test-plan.pxu b/units/gpio/test-plan.pxu
index 91d83b5..c1ffee1 100644
--- a/units/gpio/test-plan.pxu
+++ b/units/gpio/test-plan.pxu
@@ -25,7 +25,10 @@ _name: Automated GPIO tests
25_description: Automated GPIO tests for Ubuntu Core devices25_description: Automated GPIO tests for Ubuntu Core devices
26bootstrap_include:26bootstrap_include:
27 model_assertion27 model_assertion
28<<<<<<< units/gpio/test-plan.pxu
28 dmi29 dmi
30=======
31>>>>>>> units/gpio/test-plan.pxu
29include:32include:
30 gpio/sysfs_loopback_pairs_.*33 gpio/sysfs_loopback_pairs_.*
31 gpio/gpiomem_loopback_pairs_.*34 gpio/gpiomem_loopback_pairs_.*
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index 12d7ab1..ae8beb4 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -454,11 +454,15 @@ category_id: com.canonical.plainbox::info
454id: info/systemd-analyze454id: info/systemd-analyze
455estimated_duration: 0.2455estimated_duration: 0.2
456_summary: System boot-up performance statistics456_summary: System boot-up performance statistics
457<<<<<<< units/info/jobs.pxu
457command:458command:
458 # Wait for boot to complete459 # Wait for boot to complete
459 # https://github.com/systemd/systemd/pull/9796460 # https://github.com/systemd/systemd/pull/9796
460 timeout 60 systemctl is-system-running --wait > /dev/null461 timeout 60 systemctl is-system-running --wait > /dev/null
461 systemd-analyze462 systemd-analyze
463=======
464command: systemd-analyze
465>>>>>>> units/info/jobs.pxu
462466
463id: lstopo_verbose_attachment467id: lstopo_verbose_attachment
464plugin: attachment468plugin: attachment
diff --git a/units/led/test-plan.pxu b/units/led/test-plan.pxu
index b0d0129..e0ecd2a 100644
--- a/units/led/test-plan.pxu
+++ b/units/led/test-plan.pxu
@@ -115,7 +115,12 @@ include:
115 led/bluetooth115 led/bluetooth
116 led/serial116 led/serial
117 led/fn117 led/fn
118<<<<<<< units/led/test-plan.pxu
118 led/sysfs_led_brightness_on_.*119 led/sysfs_led_brightness_on_.*
119 led/sysfs_led_brightness_off_.*120 led/sysfs_led_brightness_off_.*
120bootstrap_include:121bootstrap_include:
121 dmi122 dmi
123=======
124
125
126>>>>>>> units/led/test-plan.pxu
diff --git a/units/miscellanea/test-plan.pxu b/units/miscellanea/test-plan.pxu
index 92f8019..c86991b 100644
--- a/units/miscellanea/test-plan.pxu
+++ b/units/miscellanea/test-plan.pxu
@@ -15,6 +15,10 @@ _description:
15 Miscellaneous client tests (fwts, dmi, oops) (Manual)15 Miscellaneous client tests (fwts, dmi, oops) (Manual)
16include:16include:
17nested_part:17nested_part:
18<<<<<<< units/miscellanea/test-plan.pxu
19=======
20 misc-client-cert-automated
21>>>>>>> units/miscellanea/test-plan.pxu
1822
1923
20id: misc-client-cert-automated24id: misc-client-cert-automated
@@ -84,6 +88,10 @@ _description:
84mandatory_include:88mandatory_include:
85 miscellanea/submission-resources89 miscellanea/submission-resources
86 miscellanea/cpuid90 miscellanea/cpuid
91<<<<<<< units/miscellanea/test-plan.pxu
92=======
93 miscellanea/efi_boot_mode certification-status=blocker
94>>>>>>> units/miscellanea/test-plan.pxu
87 miscellanea/ipmi_test certification-status=blocker95 miscellanea/ipmi_test certification-status=blocker
88 miscellanea/bmc_info96 miscellanea/bmc_info
89 miscellanea/dmitest_server97 miscellanea/dmitest_server
diff --git a/units/mobilebroadband/test-plan.pxu b/units/mobilebroadband/test-plan.pxu
index dc5ded9..e4e9c8b 100644
--- a/units/mobilebroadband/test-plan.pxu
+++ b/units/mobilebroadband/test-plan.pxu
@@ -14,6 +14,12 @@ _name: Mobile broadband tests (Manual)
14_description:14_description:
15 Mobile broadband tests (Manual)15 Mobile broadband tests (Manual)
16include:16include:
17<<<<<<< units/mobilebroadband/test-plan.pxu
18=======
19nested_part:
20 mobilebroadband-cert-automated
21
22>>>>>>> units/mobilebroadband/test-plan.pxu
1723
18id: mobilebroadband-cert-automated24id: mobilebroadband-cert-automated
19unit: test plan25unit: test plan
diff --git a/units/networking/test-plan.pxu b/units/networking/test-plan.pxu
index c00504f..49518fa 100644
--- a/units/networking/test-plan.pxu
+++ b/units/networking/test-plan.pxu
@@ -13,6 +13,10 @@ _name: Networking tests (manual)
13_description: Networking tests (manual)13_description: Networking tests (manual)
14include:14include:
15 networking/info_device.* certification-status=blocker15 networking/info_device.* certification-status=blocker
16<<<<<<< units/networking/test-plan.pxu
17=======
18 ethernet/hotplug-.* certification-status=blocker
19>>>>>>> units/networking/test-plan.pxu
16bootstrap_include:20bootstrap_include:
17 device21 device
1822
@@ -21,6 +25,10 @@ unit: test plan
21_name: Networking tests (automated)25_name: Networking tests (automated)
22_description: Networking tests (automated)26_description: Networking tests (automated)
23include:27include:
28<<<<<<< units/networking/test-plan.pxu
29=======
30 ethernet/detect certification-status=blocker
31>>>>>>> units/networking/test-plan.pxu
24 networking/gateway_ping certification-status=blocker32 networking/gateway_ping certification-status=blocker
25 networking/ntp certification-status=blocker33 networking/ntp certification-status=blocker
2634
@@ -29,9 +37,17 @@ unit: test plan
29_name: Networking tests (certification blockers only)37_name: Networking tests (certification blockers only)
30_description: Networking tests (certification blockers only)38_description: Networking tests (certification blockers only)
31include:39include:
40<<<<<<< units/networking/test-plan.pxu
32 networking/gateway_ping certification-status=blocker41 networking/gateway_ping certification-status=blocker
33 networking/info_device.* certification-status=blocker42 networking/info_device.* certification-status=blocker
34 networking/ntp certification-status=blocker43 networking/ntp certification-status=blocker
44=======
45 ethernet/detect certification-status=blocker
46 networking/gateway_ping certification-status=blocker
47 networking/info_device.* certification-status=blocker
48 networking/ntp certification-status=blocker
49 ethernet/hotplug-.* certification-status=blocker
50>>>>>>> units/networking/test-plan.pxu
35bootstrap_include:51bootstrap_include:
36 device52 device
3753
diff --git a/units/power-management/test-plan.pxu b/units/power-management/test-plan.pxu
index 40e5dc1..3a176bd 100644
--- a/units/power-management/test-plan.pxu
+++ b/units/power-management/test-plan.pxu
@@ -1,18 +1,29 @@
1<<<<<<< units/power-management/test-plan.pxu
1id: power-management-precheck-cert-full2id: power-management-precheck-cert-full
3=======
4id: power-management-precheck-cert
5>>>>>>> units/power-management/test-plan.pxu
2unit: test plan6unit: test plan
3_name: Power Management precheck tests7_name: Power Management precheck tests
4_description: Power Management precheck tests8_description: Power Management precheck tests
5include:9include:
6nested_part:10nested_part:
11<<<<<<< units/power-management/test-plan.pxu
7 power-management-precheck-cert-manual12 power-management-precheck-cert-manual
8 power-management-precheck-cert-automated13 power-management-precheck-cert-automated
914
10id: power-management-reboot-poweroff-cert-full15id: power-management-reboot-poweroff-cert-full
16=======
17 power-management-precheck-cert-automated
18
19id: power-management-reboot-poweroff-cert
20>>>>>>> units/power-management/test-plan.pxu
11unit: test plan21unit: test plan
12_name: Power Management reboot and power off tests22_name: Power Management reboot and power off tests
13_description: Power Management reboot and power off tests23_description: Power Management reboot and power off tests
14include:24include:
15nested_part:25nested_part:
26<<<<<<< units/power-management/test-plan.pxu
16 power-management-reboot-poweroff-cert-manual27 power-management-reboot-poweroff-cert-manual
17 power-management-reboot-poweroff-cert-automated28 power-management-reboot-poweroff-cert-automated
1829
@@ -22,6 +33,10 @@ _name: Power Management precheck tests (Manual)
22_description: Power Management precheck tests (Manual)33_description: Power Management precheck tests (Manual)
23include:34include:
2435
36=======
37 power-management-reboot-poweroff-cert-automated
38
39>>>>>>> units/power-management/test-plan.pxu
25id: power-management-precheck-cert-automated40id: power-management-precheck-cert-automated
26unit: test plan41unit: test plan
27_name: Power Management precheck tests (automated)42_name: Power Management precheck tests (automated)
@@ -32,12 +47,15 @@ include:
32 power-management/fwts_wakealarm certification-status=blocker47 power-management/fwts_wakealarm certification-status=blocker
33 power-management/fwts_wakealarm-log-attach48 power-management/fwts_wakealarm-log-attach
3449
50<<<<<<< units/power-management/test-plan.pxu
35id: power-management-reboot-poweroff-cert-manual51id: power-management-reboot-poweroff-cert-manual
36unit: test plan52unit: test plan
37_name: Power Management reboot and power off tests (Manual53_name: Power Management reboot and power off tests (Manual
38_description: Power Management reboot and power off tests (Manual)54_description: Power Management reboot and power off tests (Manual)
39include:55include:
4056
57=======
58>>>>>>> units/power-management/test-plan.pxu
41id: power-management-reboot-poweroff-cert-automated59id: power-management-reboot-poweroff-cert-automated
42unit: test plan60unit: test plan
43_name: Power Management reboot and power off tests (automated)61_name: Power Management reboot and power off tests (automated)
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index cc5414d..7c4a547 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -263,7 +263,11 @@ _summary: Automated test of suspend function
263_description:263_description:
264 This is the automated version of suspend/suspend_advanced.264 This is the automated version of suspend/suspend_advanced.
265user: root265user: root
266<<<<<<< units/suspend/suspend.pxu
266environ: PLAINBOX_SESSION_SHARE RTC_DEVICE_FILE267environ: PLAINBOX_SESSION_SHARE RTC_DEVICE_FILE
268=======
269environ: PLAINBOX_SESSION_SHARE
270>>>>>>> units/suspend/suspend.pxu
267command:271command:
268 if [[ -v SNAP ]]; then272 if [[ -v SNAP ]]; then
269 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts"273 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts"
@@ -274,11 +278,15 @@ command:
274 set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/suspend_single_times.log278 set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/suspend_single_times.log
275 else279 else
276 echo "Calling rtcwake"280 echo "Calling rtcwake"
281<<<<<<< units/suspend/suspend.pxu
277 if [ -z "$RTC_DEVICE_FILE" ]; then282 if [ -z "$RTC_DEVICE_FILE" ]; then
278 rtcwake -m mem -s 30283 rtcwake -m mem -s 30
279 else284 else
280 rtcwake -d "$RTC_DEVICE_FILE" -m mem -s 30285 rtcwake -d "$RTC_DEVICE_FILE" -m mem -s 30
281 fi286 fi
287=======
288 rtcwake -m mem -s 30
289>>>>>>> units/suspend/suspend.pxu
282 fi290 fi
283estimated_duration: 90.000291estimated_duration: 90.000
284292
diff --git a/units/ubuntucore/jobs.pxu b/units/ubuntucore/jobs.pxu
index 04c30b3..90e8d2f 100644
--- a/units/ubuntucore/jobs.pxu
+++ b/units/ubuntucore/jobs.pxu
@@ -65,7 +65,11 @@ _steps:
65 {% endif -%}65 {% endif -%}
66 1. Check the current revision of core{{release}}66 1. Check the current revision of core{{release}}
67 $ snap list core{{release}}67 $ snap list core{{release}}
68<<<<<<< units/ubuntucore/jobs.pxu
68 2. Update to edge.69 2. Update to edge.
70=======
71 2. Update to edge.
72>>>>>>> units/ubuntucore/jobs.pxu
69 Note that system will automatically reboot in 1 minute after doing this command.73 Note that system will automatically reboot in 1 minute after doing this command.
70 Please execute the command in step 3 in 1 minute to stop the automatic reboot.74 Please execute the command in step 3 in 1 minute to stop the automatic reboot.
71 $ sudo snap refresh core{{release}} --edge75 $ sudo snap refresh core{{release}} --edge
@@ -98,7 +102,11 @@ _steps:
98 {% endif -%}102 {% endif -%}
99 1. Check the current revision of core{{release}}103 1. Check the current revision of core{{release}}
100 $ snap list core{{release}}104 $ snap list core{{release}}
105<<<<<<< units/ubuntucore/jobs.pxu
101 2. Update to edge.106 2. Update to edge.
107=======
108 2. Update to edge.
109>>>>>>> units/ubuntucore/jobs.pxu
102 Note that system will automatically reboot in 1 minute after doing this command.110 Note that system will automatically reboot in 1 minute after doing this command.
103 Please execute the command in step 3 in 1 minute to stop the automatic reboot.111 Please execute the command in step 3 in 1 minute to stop the automatic reboot.
104 $ sudo snap refresh core{{release}} --edge --ignore-validation112 $ sudo snap refresh core{{release}} --edge --ignore-validation
@@ -129,6 +137,7 @@ _verification:
129plugin: manual137plugin: manual
130category_id: ubuntucore138category_id: ubuntucore
131estimated_duration: 120139estimated_duration: 120
140<<<<<<< units/ubuntucore/jobs.pxu
132141
133unit: template142unit: template
134template-resource: model_assertion143template-resource: model_assertion
@@ -152,3 +161,5 @@ _verification:
152 Check if system could boot, and kernel version is the one before switched to161 Check if system could boot, and kernel version is the one before switched to
153 "failboot" kernel162 "failboot" kernel
154category_id: ubuntucore163category_id: ubuntucore
164=======
165>>>>>>> units/ubuntucore/jobs.pxu
diff --git a/units/watchdog/jobs.pxu b/units/watchdog/jobs.pxu
index c2bd868..4b9fa79 100644
--- a/units/watchdog/jobs.pxu
+++ b/units/watchdog/jobs.pxu
@@ -9,7 +9,36 @@ command: udev_resource.py -f WATCHDOG
9id: watchdog/systemd-config9id: watchdog/systemd-config
10_summary: Check if the hardware watchdog is properly configured10_summary: Check if the hardware watchdog is properly configured
11template-engine: jinja211template-engine: jinja2
12<<<<<<< units/watchdog/jobs.pxu
12command: watchdog_config_test.py13command: watchdog_config_test.py
14=======
15command:
16 inbuilt=$(systemctl show -p RuntimeWatchdogUSec | awk -F= '{print $2}')
17 external=$(systemctl is-active watchdog.service)
18 {%- if __on_ubuntucore__ %}
19 if [ "$inbuilt" == "0" ]; then
20 echo "systemd watchdog should be enabled but reset timeout: $inbuilt"
21 exit 1
22 fi
23 if [ "$external" == "active" ]; then
24 echo "found unexpected active watchdog.service unit"
25 exit 1
26 fi
27 echo "systemd watchdog enabled, reset timeout: $inbuilt"
28 echo "watchdog.service is not active"
29 {%- else %}
30 if [ "$inbuilt" != "0" ]; then
31 echo "systemd watchdog should not be enabled but reset timeout: $inbuilt"
32 exit 1
33 fi
34 if [ "$external" != "active" ]; then
35 echo "watchdog.service unit does not report as active"
36 exit 1
37 fi
38 echo "systemd watchdog disabled"
39 echo "watchdog.service active"
40 {% endif -%}
41>>>>>>> units/watchdog/jobs.pxu
13category_id: com.canonical.plainbox::power-management42category_id: com.canonical.plainbox::power-management
14flags: simple43flags: simple
15imports: from com.canonical.plainbox import manifest44imports: from com.canonical.plainbox import manifest
diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index 95ddf31..c859702 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -551,6 +551,7 @@ command:
551estimated_duration: 2.0551estimated_duration: 2.0
552depends: wireless/nm_connection_save_{interface}552depends: wireless/nm_connection_save_{interface}
553flags: preserve-locale also-after-suspend also-after-suspend-manual553flags: preserve-locale also-after-suspend also-after-suspend-manual
554<<<<<<< units/wireless/jobs.pxu
554555
555unit: template556unit: template
556template-resource: device557template-resource: device
@@ -563,3 +564,5 @@ category_id: com.canonical.plainbox::wireless
563estimated_duration: 30.0564estimated_duration: 30.0
564flags: preserve-locale also-after-suspend565flags: preserve-locale also-after-suspend
565requires: package.name == 'systemd'566requires: package.name == 'systemd'
567=======
568>>>>>>> units/wireless/jobs.pxu
diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
index d0458cc..2d8bf7b 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -14,6 +14,12 @@ _name: Wireless tests (Manual)
14_description:14_description:
15 Wireless connection tests (Manual)15 Wireless connection tests (Manual)
16include:16include:
17<<<<<<< units/wireless/test-plan.pxu
18=======
19nested_part:
20 wireless-cert-automated
21
22>>>>>>> units/wireless/test-plan.pxu
1723
18id: after-suspend-wireless-cert-full24id: after-suspend-wireless-cert-full
19unit: test plan25unit: test plan
@@ -41,7 +47,10 @@ include:
41 wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker47 wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
42 wireless/wireless_connection_open_ax_nm_.* certification-status=blocker48 wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
43 wireless/nm_connection_restore_.*49 wireless/nm_connection_restore_.*
50<<<<<<< units/wireless/test-plan.pxu
44 wireless/check_iwlwifi_microcode_crash_.*51 wireless/check_iwlwifi_microcode_crash_.*
52=======
53>>>>>>> units/wireless/test-plan.pxu
4554
46id: after-suspend-wireless-cert-automated55id: after-suspend-wireless-cert-automated
47unit: test plan56unit: test plan
@@ -60,7 +69,10 @@ include:
60 after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker69 after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
61 after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker70 after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
62 after-suspend-wireless/nm_connection_restore_.*71 after-suspend-wireless/nm_connection_restore_.*
72<<<<<<< units/wireless/test-plan.pxu
63 after-suspend-wireless/check_iwlwifi_microcode_crash_.*73 after-suspend-wireless/check_iwlwifi_microcode_crash_.*
74=======
75>>>>>>> units/wireless/test-plan.pxu
6476
65id: after-suspend-manual-wireless-cert-automated77id: after-suspend-manual-wireless-cert-automated
66unit: test plan78unit: test plan
@@ -159,7 +171,10 @@ include:
159 wireless/wireless_connection_wpa_ac_np_.*171 wireless/wireless_connection_wpa_ac_np_.*
160 wireless/wireless_connection_wpa_bg_np_.*172 wireless/wireless_connection_wpa_bg_np_.*
161 wireless/wireless_connection_wpa_n_np_.*173 wireless/wireless_connection_wpa_n_np_.*
174<<<<<<< units/wireless/test-plan.pxu
162 wireless/check_iwlwifi_microcode_crash_.*175 wireless/check_iwlwifi_microcode_crash_.*
176=======
177>>>>>>> units/wireless/test-plan.pxu
163bootstrap_include:178bootstrap_include:
164 device179 device
165180
@@ -357,7 +372,10 @@ include:
357 after-suspend-wireless/wireless_connection_wpa_ac_np_.*372 after-suspend-wireless/wireless_connection_wpa_ac_np_.*
358 after-suspend-wireless/wireless_connection_wpa_bg_np_.*373 after-suspend-wireless/wireless_connection_wpa_bg_np_.*
359 after-suspend-wireless/wireless_connection_wpa_n_np_.*374 after-suspend-wireless/wireless_connection_wpa_n_np_.*
375<<<<<<< units/wireless/test-plan.pxu
360 after-suspend-wireless/check_iwlwifi_microcode_crash_.*376 after-suspend-wireless/check_iwlwifi_microcode_crash_.*
377=======
378>>>>>>> units/wireless/test-plan.pxu
361bootstrap_include:379bootstrap_include:
362 device380 device
363381

Subscribers

People subscribed via source and target branches