Merge ~bladernr/plainbox-provider-certification-server/+git/packaging:install-launchers into ~checkbox-dev/plainbox-provider-certification-server/+git/packaging:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Sylvain Pineau
Approved revision: a8bebd701e6ddd043b6cc197a7cd26b2b9665b35
Merged at revision: 7303419419c5c50f9d15392b560e518baf52e54b
Proposed branch: ~bladernr/plainbox-provider-certification-server/+git/packaging:install-launchers
Merge into: ~checkbox-dev/plainbox-provider-certification-server/+git/packaging:master
Diff against target: 91 lines (+15/-18)
3 files modified
debian/canonical-certification-server.install (+5/-5)
debian/canonical-certification-server.lintian-overrides (+5/-5)
debian/canonical-certification-server.rst (+5/-8)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+343043@code.launchpad.net

Commit message

Add bits to install 18.04 specific launchers.
Remove references to 14.04 launchers.

Description of the change

Add bits to install 18.04 specific launchers.
Remove references to 14.04 launchers.

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

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/canonical-certification-server.install b/debian/canonical-certification-server.install
2index 291ff85..f378f91 100644
3--- a/debian/canonical-certification-server.install
4+++ b/debian/canonical-certification-server.install
5@@ -1,15 +1,15 @@
6 usr/bin/canonical-certification-server
7+usr/bin/certify-18.04
8+usr/bin/certify-soc-18.04
9+usr/bin/certify-vm-18.04
10 usr/bin/certify-16.04
11 usr/bin/certify-soc-16.04
12 usr/bin/certify-vm-16.04
13-usr/bin/test-functional-14.04
14-usr/bin/test-network-14.04
15 usr/bin/test-storage
16 usr/bin/test-virtualization
17-usr/bin/certify-14.04
18-usr/bin/certify-soc-14.04
19-usr/bin/certify-vm-14.04
20 usr/bin/test-firmware
21+usr/bin/test-functional-18.04
22+usr/bin/test-network-18.04
23 usr/bin/test-functional-16.04
24 usr/bin/test-network-16.04
25 usr/bin/test-usb
26diff --git a/debian/canonical-certification-server.lintian-overrides b/debian/canonical-certification-server.lintian-overrides
27index baf3e06..28aef99 100644
28--- a/debian/canonical-certification-server.lintian-overrides
29+++ b/debian/canonical-certification-server.lintian-overrides
30@@ -3,16 +3,16 @@ canonical-certification-server: new-package-should-close-itp-bug
31 # Those are the desired (custom) interpreters
32 canonical-certification-server: unusual-interpreter usr/bin/canonical-certification-server #!checkbox-launcher
33 canonical-certification-server: unusual-interpreter usr/bin/canonical-certification-server #!checkbox-cli
34-canonical-certification-server: unusual-interpreter usr/bin/certify-14.04 #!checkbox-cli
35+canonical-certification-server: unusual-interpreter usr/bin/certify-18.04 #!checkbox-cli
36 canonical-certification-server: unusual-interpreter usr/bin/certify-16.04 #!checkbox-cli
37-canonical-certification-server: unusual-interpreter usr/bin/certify-soc-14.04 #!checkbox-cli
38+canonical-certification-server: unusual-interpreter usr/bin/certify-soc-18.04 #!checkbox-cli
39 canonical-certification-server: unusual-interpreter usr/bin/certify-soc-16.04 #!checkbox-cli
40-canonical-certification-server: unusual-interpreter usr/bin/certify-vm-14.04 #!checkbox-cli
41+canonical-certification-server: unusual-interpreter usr/bin/certify-vm-18.04 #!checkbox-cli
42 canonical-certification-server: unusual-interpreter usr/bin/certify-vm-16.04 #!checkbox-cli
43 canonical-certification-server: unusual-interpreter usr/bin/test-firmware #!checkbox-cli
44-canonical-certification-server: unusual-interpreter usr/bin/test-functional-14.04 #!checkbox-cli
45+canonical-certification-server: unusual-interpreter usr/bin/test-functional-18.04 #!checkbox-cli
46 canonical-certification-server: unusual-interpreter usr/bin/test-functional-16.04 #!checkbox-cli
47-canonical-certification-server: unusual-interpreter usr/bin/test-network-14.04 #!checkbox-cli
48+canonical-certification-server: unusual-interpreter usr/bin/test-network-18.04 #!checkbox-cli
49 canonical-certification-server: unusual-interpreter usr/bin/test-network-16.04 #!checkbox-cli
50 canonical-certification-server: unusual-interpreter usr/bin/test-storage #!checkbox-cli
51 canonical-certification-server: unusual-interpreter usr/bin/test-usb #!checkbox-cli
52diff --git a/debian/canonical-certification-server.rst b/debian/canonical-certification-server.rst
53index 72974c0..b2857ba 100644
54--- a/debian/canonical-certification-server.rst
55+++ b/debian/canonical-certification-server.rst
56@@ -13,22 +13,19 @@ SYNOPSIS
57 ========
58 For certifying bare metal servers, and most certification test scenaros:
59 certify-16.04
60- certify-14.04
61+ certify-18.04
62
63 For certifying Systems on Chip:
64 certify-soc-16.04
65- certify-soc-14.04
66+ certify-soc-18.04
67
68 For certifying Ubuntu as a Guest on a Hypervisor:
69 certify-vm-16.04
70- certify-vm-14.04
71-
72- Abbreviated functional test that does not include lengthy stress tests:
73- test-functional-14.04
74+ certify-vm-18.04
75
76 Retest commands for running retests on a specific subsystem:
77 test-network-16.04
78- test-network-14.04
79+ test-network-18.04
80 test-storage
81 test-virtualization
82 test-firmware
83@@ -36,7 +33,7 @@ SYNOPSIS
84
85 Runs functional testing only, no stress test cases are executed:
86 test-functional-16.04
87- test-functional-14.04
88+ test-functional-18.04
89
90 Runs checkbox-cli with full list of test plans and cases to select:
91 canonical-certification-server

Subscribers

People subscribed via source and target branches