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
diff --git a/launcher/canonical-certification-cli b/launcher/canonical-certification-cli
index 9d6ccb8..6e58ce0 100755
--- a/launcher/canonical-certification-cli
+++ b/launcher/canonical-certification-cli
@@ -1,9 +1,9 @@
1#!/usr/bin/env checkbox-cli1#!/usr/bin/env checkbox-cli
2[launcher]2[launcher]
3app_id = 2013.com.canonical.certification:certification-client3app_id = com.canonical.certification:certification-client
4launcher_version = 14launcher_version = 1
5stock_reports = text, submission_files, certification5stock_reports = text, submission_files, certification
66
7[test plan]7[test plan]
8unit = 2013.com.canonical.certification::client-cert-16-048unit = com.canonical.certification::client-cert-16-04
9filter = *client-cert*, *client-selftest*, *client-hwe*9filter = *client-cert*, *client-selftest*, *client-hwe*
diff --git a/launcher/canonical-certification-client b/launcher/canonical-certification-client
index 181d5d7..fe1602f 100755
--- a/launcher/canonical-certification-client
+++ b/launcher/canonical-certification-client
@@ -1,11 +1,11 @@
1#!/usr/bin/env checkbox-cli1#!/usr/bin/env checkbox-cli
2[launcher]2[launcher]
3app_id = 2013.com.canonical.certification:certification-client3app_id = com.canonical.certification:certification-client
4launcher_version = 14launcher_version = 1
5stock_reports = submission_files, certification5stock_reports = submission_files, certification
66
7[test plan]7[test plan]
8unit = 2013.com.canonical.certification::client-cert-16-048unit = com.canonical.certification::client-cert-16-04
9filter = *client-cert*, *client-selftest*, *client-hwe*9filter = *client-cert*, *client-selftest*, *client-hwe*
1010
11[ui]11[ui]
diff --git a/manage.py b/manage.py
index a362583..c8deb1e 100755
--- a/manage.py
+++ b/manage.py
@@ -78,7 +78,7 @@ class InstallCommandExt(InstallCommand):
7878
79setup(79setup(
80 name='certification-client',80 name='certification-client',
81 namespace='2013.com.canonical.certification',81 namespace='com.canonical.certification',
82 version="0.31.0.dev0",82 version="0.31.0.dev0",
83 description=N_("Client Certification provider"),83 description=N_("Client Certification provider"),
84 gettext_domain="certification-client",84 gettext_domain="certification-client",
diff --git a/units/client-cert-14-04-3.pxu b/units/client-cert-14-04-3.pxu
index 9408057..de13691 100644
--- a/units/client-cert-14-04-3.pxu
+++ b/units/client-cert-14-04-3.pxu
@@ -372,7 +372,7 @@ bootstrap_include:
372 fwts372 fwts
373 graphics_card373 graphics_card
374mandatory_include:374mandatory_include:
375 2013.com.canonical.plainbox::collect-manifest375 com.canonical.plainbox::collect-manifest
376 miscellanea/device_check376 miscellanea/device_check
377 # Meta-job to include required resources, don't remove.377 # Meta-job to include required resources, don't remove.
378 miscellanea/submission-resources378 miscellanea/submission-resources
diff --git a/units/client-cert-14-04.pxu b/units/client-cert-14-04.pxu
index 320b6dc..4ee3a68 100644
--- a/units/client-cert-14-04.pxu
+++ b/units/client-cert-14-04.pxu
@@ -356,7 +356,7 @@ bootstrap_include:
356 fwts356 fwts
357 graphics_card357 graphics_card
358mandatory_include:358mandatory_include:
359 2013.com.canonical.plainbox::collect-manifest359 com.canonical.plainbox::collect-manifest
360 miscellanea/device_check360 miscellanea/device_check
361 # Meta-job to include required resources, don't remove.361 # Meta-job to include required resources, don't remove.
362 miscellanea/submission-resources362 miscellanea/submission-resources
diff --git a/units/client-cert-16-04.pxu b/units/client-cert-16-04.pxu
index 2eb7558..73155ab 100644
--- a/units/client-cert-16-04.pxu
+++ b/units/client-cert-16-04.pxu
@@ -389,7 +389,7 @@ bootstrap_include:
389 fwts389 fwts
390 graphics_card390 graphics_card
391mandatory_include:391mandatory_include:
392 2013.com.canonical.plainbox::collect-manifest392 com.canonical.plainbox::collect-manifest
393 miscellanea/device_check393 miscellanea/device_check
394 # Meta-job to include required resources, don't remove.394 # Meta-job to include required resources, don't remove.
395 miscellanea/submission-resources395 miscellanea/submission-resources
diff --git a/units/client-cert-n+1.pxu b/units/client-cert-n+1.pxu
index 5c630df..de13702 100644
--- a/units/client-cert-n+1.pxu
+++ b/units/client-cert-n+1.pxu
@@ -242,6 +242,6 @@ bootstrap_include:
242 fwts242 fwts
243 graphics_card243 graphics_card
244mandatory_include:244mandatory_include:
245 2013.com.canonical.plainbox::collect-manifest245 com.canonical.plainbox::collect-manifest
246 # Meta-job to include required resources, don't remove.246 # Meta-job to include required resources, don't remove.
247 miscellanea/submission-resources247 miscellanea/submission-resources
diff --git a/units/client-hwe-sru.pxu b/units/client-hwe-sru.pxu
index a3549bb..00fbf19 100644
--- a/units/client-hwe-sru.pxu
+++ b/units/client-hwe-sru.pxu
@@ -101,7 +101,7 @@ bootstrap_include:
101 device101 device
102 graphics_card102 graphics_card
103mandatory_include:103mandatory_include:
104 2013.com.canonical.plainbox::collect-manifest104 com.canonical.plainbox::collect-manifest
105 # A meta-job that includes the resources needed for a valid submission.105 # A meta-job that includes the resources needed for a valid submission.
106 # Please do not remove without good reason.106 # Please do not remove without good reason.
107 miscellanea/submission-resources107 miscellanea/submission-resources
diff --git a/units/client-selftest-14-04.pxu b/units/client-selftest-14-04.pxu
index ac432db..66223cd 100644
--- a/units/client-selftest-14-04.pxu
+++ b/units/client-selftest-14-04.pxu
@@ -371,6 +371,6 @@ bootstrap_include:
371 fwts371 fwts
372 graphics_card372 graphics_card
373mandatory_include:373mandatory_include:
374 2013.com.canonical.plainbox::collect-manifest374 com.canonical.plainbox::collect-manifest
375 # Meta-job to include required resources, don't remove.375 # Meta-job to include required resources, don't remove.
376 miscellanea/submission-resources376 miscellanea/submission-resources

Subscribers

People subscribed via source and target branches