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

[Jeff Lane ]

Modified packaging to install newly created launcher files.

[Paul Larson (pwlars)]

Some minor questions, but not necessarily anything that needs to be fixed. See what you think, but +1 otherwise.

review: Approve

[Jeff Lane  (bladernr)]

Thanks for pointing that one line out. It was, indeed, not meant to be inconsistent with the rest, so I changed it.

As for the wrapper script, it's more a personal preference. Consider it basically a "launcher" for checkbox-cli to submit results. I'd prefer to provide the users (who are 95% outside Canonical and are our "customers" as well as "partners") a specific command that looks more "Official".

I realize it's 6 of one, 1/2 dozen of the other here, so it really is just a personal preference to have them use "canonical-certification-submit" as the official "tool" to submit. We've been using CCS for years at this point, and there isn't a really compelling reason to fall back to "call the underlying back-end directly".

diff --git a/debian/canonical-certification-server.install b/debian/canonical-certification-server.install
index 6bc3341..93c7c7e 100644
--- a/debian/canonical-certification-server.install
+++ b/debian/canonical-certification-server.install
@@ -1 +1,15 @@
 usr/bin/canonical-certification-server
+usr/bin/certify-16.04
+usr/bin/certify-soc-16.04
+usr/bin/certify-vm-16.04
+usr/bin/test-functional-14.04
+usr/bin/test-network-14.04
+usr/bin/test-storage
+usr/bin/test-virtualziation
+usr/bin/certify-14.04
+usr/bin/certify-soc-14.04
+usr/bin/certify-vm-14.04
+usr/bin/test-firmware
+usr/bin/test-functional-16.04
+usr/bin/test-network-16.04
+usr/bin/test-usb
diff --git a/debian/canonical-certification-server.lintian-overrides b/debian/canonical-certification-server.lintian-overrides
index 89960b8..e8cc403 100644
--- a/debian/canonical-certification-server.lintian-overrides
+++ b/debian/canonical-certification-server.lintian-overrides
@@ -2,3 +2,18 @@
 canonical-certification-server: new-package-should-close-itp-bug
 # Those are the desired (custom) interpreters
 canonical-certification-server: unusual-interpreter usr/bin/canonical-certification-server #!checkbox-launcher
+canonical-certification-server: unusual-interpreter usr/bin/canonical-certification-server #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/certify-14.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/certify-16.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/certify-soc-14.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/certify-soc-16.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/certify-vm-14.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/certify-vm-16.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/test-firmware #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/test-functional-14.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/test-functional-16.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/test-network-14.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/test-network-16.04 #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/test-storage #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/test-usb #!checkbox-cli
+canonical-certification-server: unusual-interpreter usr/bin/test-virtualziation #!checkbox-cli
diff --git a/debian/canonical-certification-server.rst b/debian/canonical-certification-server.rst
index 95ba797..a2cf884 100644
--- a/debian/canonical-certification-server.rst
+++ b/debian/canonical-certification-server.rst
@@ -7,11 +7,39 @@ performs interactive system testing in console mode and sends results to Canonic
 --------------------------------------------------------------------------------------------------------
 
 :Manual section: 1
-:Author: Sylvain Pineau, 2015
+:Author: Jeffrey Lane, 2018
 
 SYNOPSIS
 ========
-  canonical-certification-server
+  For certifying bare metal servers, and most certification test scenaros:
+    certify-16.04 
+    certify-14.04
+
+  For certifying Systems on Chip:
+    certify-soc-16.04
+    certify-soc-14.04
+  
+  For certifying Ubuntu as a Guest on a Hypervisor:
+    certify-vm-16.04
+    certify-vm-14.04
+
+  Abbreviated functional test that does not include lengthy stress tests:
+    test-functional-14.04
+
+  Retest commands for running retests on a specific subsystem:
+    test-network-16.04
+    test-network-14.04
+    test-storage
+    test-virtualziation
+    test-firmware
+    test-usb
+
+  Runs functional testing only, no stress test cases are executed:
+    test-functional-16.04
+    test-functional-14.04
+
+  Runs checkbox-cli with full list of test plans and cases to select:
+    canonical-certification-server
 
 OPTIONS
 =======
@@ -31,7 +59,14 @@ manual tests to confirm that the system is working properly. Finally, you will
 be asked for the Secure ID of the computer to submit the information to the
 certification.canonical.com database.
 
+Testers shoud run any of the certify-* commands to submit official
+certification tests to Canonical.  Should retests be necessary, the tester will
+be directed to run one of the retest commands by the Certification Team.
+
 TEST PLAN SELECTION
 ===================
 
-This program will allow you to select test any test plan.
+The command 'canonical-certification-server' will allow you to select test any
+test plan. The other commands will launch certification without the ability to 
+alter selections and these are the commands that should be used for 
+certification testing unless otherwise instructed.