Merge lp:~sylvain-pineau/checkbox/hwcollect_cleanup into lp:checkbox

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4510
Merged at revision: 4515
Proposed branch: lp:~sylvain-pineau/checkbox/hwcollect_cleanup
Merge into: lp:checkbox
Diff against target: 245 lines (+0/-205)
7 files modified
providers/README.rst (+0/-95)
providers/plainbox-provider-hwcollect/.bzrignore (+0/-2)
providers/plainbox-provider-hwcollect/.gitignore (+0/-2)
providers/plainbox-provider-hwcollect/README.md (+0/-47)
providers/plainbox-provider-hwcollect/manage.py (+0/-21)
providers/plainbox-provider-hwcollect/po/POTFILES.in (+0/-3)
providers/plainbox-provider-hwcollect/units/hwcollect.pxu (+0/-35)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/hwcollect_cleanup
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+307376@code.launchpad.net

Description of the change

cleanup of unused provider, hwcollect. hwsubmit testplan in the checkbox provider contains the same thing.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'providers/README.rst'
--- providers/README.rst 2015-08-17 10:03:17 +0000
+++ providers/README.rst 1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
1Plainbox Providers
2==================
3
4This directory contains a number of Plainbox Providers. Those providers are
5kept here for both historic reasons and some extra simplicity in making changes
6that also require synchronized updates to other parts of the greater Checkbox
7project (e.g. changes to checkbox-support or to plainbox).
8
9In-Tree Providers
10=================
11
12The following providers are kept here, in tree:
13
14``2015.com.canonical.certification:qml-tests/``:
15
16 Tests natively implemented in QML and the Ubuntu SDK libraries. Tests in
17 this provider are used by Checkbox on the Ubuntu Phone.
18
19``plainbox-provider-checkbox/``:
20
21 Oldest and most varied collection of tests. The tests themselves are used
22 by various other providers (they are referenced from their test plans).
23
24``plainbox-provider-hwcollect/``:
25
26 The provider that is meant to fuel the needs of ``canonical-hw-collection``
27 tool. Currently unused.
28
29``plainbox-provider-piglit/``:
30
31 A small provider, split off from the Checkbox provider, focused on wrapping
32 and exposing the ``piglit`` OpenGL testing tool. Jobs from this provider
33 are used in some test plans, most notably in CDTS.
34
35``plainbox-provider-resource-generic/``:
36
37 A provider much smaller than checkbox that is aways used alongside with it.
38 This provider contains various resource jobs and utility scripts. It is
39 used in both on Ubuntu desktop and server environments.
40
41``plainbox-provider-snappy-ubuntu-core/``:
42
43 A provider that contains new jobs focused on Ubuntu Snappy Core
44 environment. As of August 2015 this is an area of active research.
45
46``plainbox-provider-ubuntu-touch/``:
47
48 A provider that contains now jobs focused on Ubuntu Phone environments.
49 This provider is shipped, bundled, with Checkbox Touch and is available in
50 the Ubuntu Store.
51
52Out-Of-Tree Providers
53=====================
54
55The following providers are kept out of tree, they are referenced here so
56that developers can find pointers to some of the code that was here before.
57
58
59``plainbox-provider-canonical-driver-test-suite``:
60
61 The provider is present on the ``cdts`` project, on Lauchpad, in bzr, in
62 the main branch of the project. This provider refers to various jobs in the
63 checkbox and piglit providers.
64
65 A handy link to the code is:
66
67 https://code.launchpad.net/~checkbox-ihv-ng/cdts/trunk
68
69``plainbox-provider-certification-client``:
70
71 The provider is present on the
72 ``plainbox-provider-canonical-certification`` project, on Launchpad, in
73 Git, in the ``master-client`` branch.
74
75 This provider is used by the Canonical Certification team for certification
76 of "client" hardware (desktops, laptops, etc.). This provider is mainly a
77 list of test plans that refer to the jobs in the checkbox provider.
78
79 A handy link to the code is:
80
81 https://code.launchpad.net/~checkbox-dev/plainbox-provider-canonical-certification/+git/plainbox-provider-canonical-certification/+ref/master-client
82
83``plainbox-provider-certification-server``:
84
85 The provider is present on the
86 ``plainbox-provider-canonical-certification`` project, on Launchpad, in
87 Git, in the ``master-server`` branch.
88
89 This provider is used by the Canonical Certification team for certification
90 of server hardware. This provider is mainly a list of test plans that refer
91 to the jobs in the checkbox provider.
92
93 A handy link to the code is:
94
95 https://code.launchpad.net/~checkbox-dev/plainbox-provider-canonical-certification/+git/plainbox-provider-canonical-certification/+ref/master-server
960
=== removed directory 'providers/plainbox-provider-hwcollect'
=== removed file 'providers/plainbox-provider-hwcollect/.bzrignore'
--- providers/plainbox-provider-hwcollect/.bzrignore 2015-08-03 14:10:45 +0000
+++ providers/plainbox-provider-hwcollect/.bzrignore 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1dist/*.tar.gz
2build/mo/*
3\ No newline at end of file0\ No newline at end of file
41
=== removed file 'providers/plainbox-provider-hwcollect/.gitignore'
--- providers/plainbox-provider-hwcollect/.gitignore 2015-08-03 14:10:45 +0000
+++ providers/plainbox-provider-hwcollect/.gitignore 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1dist/*.tar.gz
2build/mo/*
3\ No newline at end of file0\ No newline at end of file
41
=== removed file 'providers/plainbox-provider-hwcollect/README.md'
--- providers/plainbox-provider-hwcollect/README.md 2015-08-03 14:10:45 +0000
+++ providers/plainbox-provider-hwcollect/README.md 1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
1Skeleton for a new PlainBox provider
2====================================
3
4This is a skeleton PlainBox provider that was generated using
5``plainbox startprovider ...``.
6
7It is just the starting point, there is nothing here of value to you
8yet. If you know how this works then just remove this file along with
9other example content and start working on your new tests,
10otherwise, read on.
11
12Inside the ``jobs/`` directory you will find several files that define
13a number of "jobs" (more than one job per file actually). A job, in
14PlainBox parlance, is the smallest piece of executable test code. Each
15job has a name and a number of other attributes.
16
17Jobs can be arranged in lists, test plans if you will that are known
18as "whitelists". Those are defined in the ``whitelists/`` directory,
19this time one per file. You can create as many whitelists as you need,
20referring to arbitrary subsets of your jobs.
21
22Then there are the ``bin/`` and ``data/`` directories. Those are
23entirely for custom content you may need. You can put arbitrary
24executables in ``bin/``, and those will be available to your job
25definitions. Similarly you can keep any data your jobs might need
26inside the ``data/`` directory. Referring to that directory at runtime
27is a little bit trickier but one of the examples generated in this
28skeleton shows how to do that.
29
30Lastly there is the ``manage.py`` script. It requires python3 to run.
31It depends on the python3-plainbox Debian package (or just the
32PlainBox 0.5 upstream package) installed. This script can automate and
33simplify a number of tasks that you will want to do as a test
34developer.
35
36Run ``./manage.py --help`` to see what sub-commands are available. You
37can additionally pass ``--help`` to each sub command, for example
38``./manage.py install --help`` will print the description of the
39install command and all the arguments it supports.
40
41That is it for now. You should check out the official documentation
42for test authors at
43http://plainbox.readthedocs.org/en/latest/author/index.html
44
45If you find bugs or would like to see additional features developed
46you can file bugs on the parent project page:
47https://bugs.launchpad.net/checkbox/+filebug
48\ No newline at end of file0\ No newline at end of file
491
=== removed file 'providers/plainbox-provider-hwcollect/manage.py'
--- providers/plainbox-provider-hwcollect/manage.py 2015-08-03 14:10:45 +0000
+++ providers/plainbox-provider-hwcollect/manage.py 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1#!/usr/bin/env python3
2from plainbox.provider_manager import setup, N_
3
4# You can inject other stuff here but please don't go overboard.
5#
6# In particular, if you need comprehensive compilation support to get
7# your bin/ populated then please try to discuss that with us in the
8# upstream project IRC channel #checkbox on irc.freenode.net.
9
10# NOTE: one thing that you could do here, that makes a lot of sense,
11# is to compute version somehow. This may vary depending on the
12# context of your provider. Future version of PlainBox will offer git,
13# bzr and mercurial integration using the versiontools library
14# (optional)
15
16setup(
17 name='2013.com.canonical.certification:hwcollect',
18 version="1.0",
19 description=N_("Plainbox provide for the Canonical hardware collection tool"),
20 gettext_domain="plainbox-provider-hwcollect"
21)
220
=== removed directory 'providers/plainbox-provider-hwcollect/po'
=== removed file 'providers/plainbox-provider-hwcollect/po/POTFILES.in'
--- providers/plainbox-provider-hwcollect/po/POTFILES.in 2016-03-07 07:18:04 +0000
+++ providers/plainbox-provider-hwcollect/po/POTFILES.in 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1[encoding: UTF-8]
2[type: gettext/rfc822deb] units/hwcollect.pxu
3manage.py
40
=== removed directory 'providers/plainbox-provider-hwcollect/units'
=== removed file 'providers/plainbox-provider-hwcollect/units/hwcollect.pxu'
--- providers/plainbox-provider-hwcollect/units/hwcollect.pxu 2015-08-08 22:22:28 +0000
+++ providers/plainbox-provider-hwcollect/units/hwcollect.pxu 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
1unit: test plan
2id: hwcollect
3_name: Hardware collection
4include:
5 cdimage
6 cpuinfo
7 device
8 dmi
9 dpkg
10 gconf
11 lsb
12 meminfo
13 module
14 package
15 uname
16 usb
17 __info__
18 info/buildstamp
19 cpuinfo_attachment
20 dmesg_attachment
21 dmi_attachment
22 dmidecode_attachment
23 kernel_cmdline_attachment
24 recovery_info_attachment
25 dell_bto_xml_attachment
26 lsmod_attachment
27 dkms_info_attachment
28 lspci_attachment
29 lspci_standard_config_attachment
30 modinfo_attachment
31 modprobe_attachment
32 modules_attachment
33 sysfs_attachment
34 sysctl_attachment
35 udev_attachment

Subscribers

People subscribed via source and target branches