Merge ~sylvain-pineau/plainbox-provider-certification-client:drop-year-from-namespaces into plainbox-provider-certification-client:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 35c5ad5194b94222136a91ff603fc839963c2707
Merged at revision: bdf1aa2dbd55ec0a8891e38a146a2666c2372f60
Proposed branch: ~sylvain-pineau/plainbox-provider-certification-client:drop-year-from-namespaces
Merge into: plainbox-provider-certification-client:master
Diff against target: 123 lines (+11/-11)
9 files modified
launcher/canonical-certification-cli (+2/-2)
launcher/canonical-certification-client (+2/-2)
manage.py (+1/-1)
units/client-cert-14-04-3.pxu (+1/-1)
units/client-cert-14-04.pxu (+1/-1)
units/client-cert-16-04.pxu (+1/-1)
units/client-cert-n+1.pxu (+1/-1)
units/client-hwe-sru.pxu (+1/-1)
units/client-selftest-14-04.pxu (+1/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+326964@code.launchpad.net

Description of the change

remove 2013. prefix from all IDs

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

self-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/launcher/canonical-certification-cli b/launcher/canonical-certification-cli
2index 9d6ccb8..6e58ce0 100755
3--- a/launcher/canonical-certification-cli
4+++ b/launcher/canonical-certification-cli
5@@ -1,9 +1,9 @@
6 #!/usr/bin/env checkbox-cli
7 [launcher]
8-app_id = 2013.com.canonical.certification:certification-client
9+app_id = com.canonical.certification:certification-client
10 launcher_version = 1
11 stock_reports = text, submission_files, certification
12
13 [test plan]
14-unit = 2013.com.canonical.certification::client-cert-16-04
15+unit = com.canonical.certification::client-cert-16-04
16 filter = *client-cert*, *client-selftest*, *client-hwe*
17diff --git a/launcher/canonical-certification-client b/launcher/canonical-certification-client
18index 181d5d7..fe1602f 100755
19--- a/launcher/canonical-certification-client
20+++ b/launcher/canonical-certification-client
21@@ -1,11 +1,11 @@
22 #!/usr/bin/env checkbox-cli
23 [launcher]
24-app_id = 2013.com.canonical.certification:certification-client
25+app_id = com.canonical.certification:certification-client
26 launcher_version = 1
27 stock_reports = submission_files, certification
28
29 [test plan]
30-unit = 2013.com.canonical.certification::client-cert-16-04
31+unit = com.canonical.certification::client-cert-16-04
32 filter = *client-cert*, *client-selftest*, *client-hwe*
33
34 [ui]
35diff --git a/manage.py b/manage.py
36index a362583..c8deb1e 100755
37--- a/manage.py
38+++ b/manage.py
39@@ -78,7 +78,7 @@ class InstallCommandExt(InstallCommand):
40
41 setup(
42 name='certification-client',
43- namespace='2013.com.canonical.certification',
44+ namespace='com.canonical.certification',
45 version="0.31.0.dev0",
46 description=N_("Client Certification provider"),
47 gettext_domain="certification-client",
48diff --git a/units/client-cert-14-04-3.pxu b/units/client-cert-14-04-3.pxu
49index 9408057..de13691 100644
50--- a/units/client-cert-14-04-3.pxu
51+++ b/units/client-cert-14-04-3.pxu
52@@ -372,7 +372,7 @@ bootstrap_include:
53 fwts
54 graphics_card
55 mandatory_include:
56- 2013.com.canonical.plainbox::collect-manifest
57+ com.canonical.plainbox::collect-manifest
58 miscellanea/device_check
59 # Meta-job to include required resources, don't remove.
60 miscellanea/submission-resources
61diff --git a/units/client-cert-14-04.pxu b/units/client-cert-14-04.pxu
62index 320b6dc..4ee3a68 100644
63--- a/units/client-cert-14-04.pxu
64+++ b/units/client-cert-14-04.pxu
65@@ -356,7 +356,7 @@ bootstrap_include:
66 fwts
67 graphics_card
68 mandatory_include:
69- 2013.com.canonical.plainbox::collect-manifest
70+ com.canonical.plainbox::collect-manifest
71 miscellanea/device_check
72 # Meta-job to include required resources, don't remove.
73 miscellanea/submission-resources
74diff --git a/units/client-cert-16-04.pxu b/units/client-cert-16-04.pxu
75index 2eb7558..73155ab 100644
76--- a/units/client-cert-16-04.pxu
77+++ b/units/client-cert-16-04.pxu
78@@ -389,7 +389,7 @@ bootstrap_include:
79 fwts
80 graphics_card
81 mandatory_include:
82- 2013.com.canonical.plainbox::collect-manifest
83+ com.canonical.plainbox::collect-manifest
84 miscellanea/device_check
85 # Meta-job to include required resources, don't remove.
86 miscellanea/submission-resources
87diff --git a/units/client-cert-n+1.pxu b/units/client-cert-n+1.pxu
88index 5c630df..de13702 100644
89--- a/units/client-cert-n+1.pxu
90+++ b/units/client-cert-n+1.pxu
91@@ -242,6 +242,6 @@ bootstrap_include:
92 fwts
93 graphics_card
94 mandatory_include:
95- 2013.com.canonical.plainbox::collect-manifest
96+ com.canonical.plainbox::collect-manifest
97 # Meta-job to include required resources, don't remove.
98 miscellanea/submission-resources
99diff --git a/units/client-hwe-sru.pxu b/units/client-hwe-sru.pxu
100index a3549bb..00fbf19 100644
101--- a/units/client-hwe-sru.pxu
102+++ b/units/client-hwe-sru.pxu
103@@ -101,7 +101,7 @@ bootstrap_include:
104 device
105 graphics_card
106 mandatory_include:
107- 2013.com.canonical.plainbox::collect-manifest
108+ com.canonical.plainbox::collect-manifest
109 # A meta-job that includes the resources needed for a valid submission.
110 # Please do not remove without good reason.
111 miscellanea/submission-resources
112diff --git a/units/client-selftest-14-04.pxu b/units/client-selftest-14-04.pxu
113index ac432db..66223cd 100644
114--- a/units/client-selftest-14-04.pxu
115+++ b/units/client-selftest-14-04.pxu
116@@ -371,6 +371,6 @@ bootstrap_include:
117 fwts
118 graphics_card
119 mandatory_include:
120- 2013.com.canonical.plainbox::collect-manifest
121+ com.canonical.plainbox::collect-manifest
122 # Meta-job to include required resources, don't remove.
123 miscellanea/submission-resources

Subscribers

People subscribed via source and target branches