Merge ~pieq/plainbox-provider-certification-server/+git/packaging:add-plainbox-packaging-metadata-support into ~checkbox-dev/plainbox-provider-certification-server/+git/packaging:master

Proposed by Pierre Equoy
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 5b030f45dce0dd3a0cc6a2c1486c38d3568637e9
Merged at revision: 2796a83dd5a7cc9c7fc24f770c3c944857a06da8
Proposed branch: ~pieq/plainbox-provider-certification-server/+git/packaging:add-plainbox-packaging-metadata-support
Merge into: ~checkbox-dev/plainbox-provider-certification-server/+git/packaging:master
Diff against target: 53 lines (+12/-6)
2 files modified
debian/control (+8/-6)
debian/rules (+4/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+317745@code.launchpad.net

Description of the change

Add support for Plainbox packaging metadata

Packaging now relies on metadata described in the Server provider directly to determine package dependencies.

Please check the package built from this in my personal PPA:

https://launchpad.net/~pierre-equoy/+archive/ubuntu/ppa/+sourcepub/7497820/+listing-archive-extra

The generated control file looks like this:

----------------------------------------
Package: plainbox-provider-certification-server
Version: 0.32.0-0~2017020822482~ubuntu16.04.1
Architecture: all
Maintainer: Ubuntu Developers <email address hidden>
Installed-Size: 87
Depends: plainbox-provider-checkbox (>= 0.27~), iperf3, genisoimage, fwupdate, numactl, bc
Recommends: bonnie++, canonical-certification-submit, cpu-checker, fwts (>= 16.02.00-0ubuntu1~), iperf, ipmitool, nmap, plainbox-insecure-policy, qemu-system, qemu-utils, ssh, stress, stress-ng
Section: utils
Priority: optional
Description: Server Certification provider for Plainbox
 This package provides a test set of test plans that are used by Canonical
 for the testing and certification of "server" devices.
 .
 The actual tests (also known as plainbox jobs) are sourced from checkbox and
 plainbox resource providers. This package only contains the test plans
 themselves.
----------------------------------------

Please note that the `bc` package is in the Depends section because it was defined like this in the plainbox packaging metadata unit [1]

[1] https://git.launchpad.net/plainbox-provider-certification-server/tree/units/packaging.pxu#n24

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1, thanks for the cleanup (bc, genisoimage, iperf3)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index 50f2179..fa79c26 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -8,20 +8,19 @@ Build-Depends: debhelper (>= 9.2),
6 plainbox (>= 0.27~),
7 plainbox-provider-resource-generic (>= 0.25~),
8 python3-all (>= 3.2),
9+ python3-debian,
10 python3-setuptools
11 Vcs-Git: git://git.launchpad.net/plainbox-provider-canonical-certification
12
13 Package: plainbox-provider-certification-server
14 Architecture: all
15-Depends: plainbox-provider-checkbox (>= 0.27~)
16-Recommends: bc,
17- bonnie++,
18+Depends: plainbox-provider-checkbox (>= 0.27~),
19+ ${plainbox:Depends}
20+Recommends: bonnie++,
21 canonical-certification-submit,
22 cpu-checker,
23 fwts (>=16.02.00-0ubuntu1~),
24- genisoimage,
25 iperf,
26- iperf3,
27 ipmitool,
28 nmap,
29 plainbox-insecure-policy,
30@@ -29,7 +28,10 @@ Recommends: bc,
31 qemu-utils,
32 ssh,
33 stress,
34- stress-ng
35+ stress-ng,
36+ ${plainbox:Recommends}
37+Suggests: ${plainbox:Suggests}
38+X-Plainbox-Provider: yes
39 Description: Server Certification provider for Plainbox
40 This package provides a test set of test plans that are used by Canonical
41 for the testing and certification of "server" devices.
42diff --git a/debian/rules b/debian/rules
43index cfba8c3..8015df9 100755
44--- a/debian/rules
45+++ b/debian/rules
46@@ -34,3 +34,7 @@ override_dh_auto_install:
47 # But don't modify the name, it has to be exactly as before
48 sed -i -e 's!name = $(terse_id)!name = $(verbose_id)!g' \
49 debian/tmp/usr/share/plainbox-providers-1/$(terse_id).provider
50+
51+override_dh_gencontrol:
52+ python3 manage.py packaging
53+ dh_gencontrol

Subscribers

People subscribed via source and target branches