Merge ~sylvain-pineau/plainbox-provider-canonical-certification:converged_launchers into plainbox-provider-canonical-certification:master-client

[Sylvain Pineau]

Launchers update to use the new ui type "converged" and finally replace checkbox-gui shebang.
The default testplan is now 16.04 and the testplan filters only selects certification test plans.
This MR also removes obsolete launchers (-gui and canonical-hw-collection)

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/launcher/canonical-certification-cli b/launcher/canonical-certification-cli
index e653c48..9d6ccb8 100755
--- a/launcher/canonical-certification-cli
+++ b/launcher/canonical-certification-cli
@@ -5,5 +5,5 @@ launcher_version = 1
 stock_reports = text, submission_files, certification
 
 [test plan]
-unit = 2013.com.canonical.certification::client-cert-14-04
-filter = *
+unit = 2013.com.canonical.certification::client-cert-16-04
+filter = *client-cert*, *client-selftest*, *client-hwe*
diff --git a/launcher/canonical-certification-client b/launcher/canonical-certification-client
index a0b4d96..181d5d7 100755
--- a/launcher/canonical-certification-client
+++ b/launcher/canonical-certification-client
@@ -1,25 +1,12 @@
-#!/usr/bin/checkbox-gui
-
-[welcome]
-title = "System Certification"
-text = "<p>Welcome to System Certification!</p><p></p><p>This application will
- gather information from your system. Then you will be asked 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
- database.</p><p></p><p> To learn how to create or locate the Secure ID,
- please see here: <a href=\"https://certification.canonical.com\">certification.canonical.com</a></p><p></p>"
-
-[suite]
-whitelist_filter = "^client-(cert|selftest|hwe-sru).*"
-
-[submission]
-input_type = "regex"
-input_placeholder = "Secure ID (15 or 18 characters)"
-ok_btn_text = "Submit Results"
-submit_to_hexr = "true"
-
-[exporter]
-xml_export_path = "/tmp/submission.xml"
-
-[transport]
-submit_to = "certification"
+#!/usr/bin/env checkbox-cli
+[launcher]
+app_id = 2013.com.canonical.certification:certification-client
+launcher_version = 1
+stock_reports = submission_files, certification
+
+[test plan]
+unit = 2013.com.canonical.certification::client-cert-16-04
+filter = *client-cert*, *client-selftest*, *client-hwe*
+
+[ui]
+type = converged
diff --git a/launcher/canonical-certification-gui b/launcher/canonical-certification-gui
deleted file mode 100755
index 2dbbc5d..0000000
--- a/launcher/canonical-certification-gui
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/checkbox-gui
-
-[welcome]
-title = "Canonical system testing"
-text = "<p>Welcome to Canonical System testing!</p><p></p><p>This application will
- gather information from your system. Then you will be asked 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
- database.</p><p></p><p> To learn how to create or locate the Secure ID,
- please see here: <a href=\"https://certification.canonical.com\">certification.canonical.com</a></p><p></p>"
-
-[suite]
-whitelist_filter = "^.*"
-
-[submission]
-input_type = "regex"
-input_placeholder = "Secure ID (15 or 18 characters)"
-ok_btn_text = "Submit to Certification website"
-submit_to_hexr = "true"
-
-[exporter]
-xml_export_path = "/tmp/submission.xml"
-
-[transport]
-submit_to = "certification"
diff --git a/launcher/canonical-certification-gui.desktop b/launcher/canonical-certification-gui.desktop
deleted file mode 100644
index ac7cf11..0000000
--- a/launcher/canonical-certification-gui.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Canonical System Testing
-Comment=Test your system with Ubuntu
-Type=Application
-Exec=/usr/bin/canonical-certification-gui
-Icon=checkbox
-Categories=System;Qt;Application
-Keywords=certification;certify;testing;drivers;hardware;
-X-GNOME-Gettext-Domain=checkbox-gui
-X-Ayatana-Appmenu-Show-Stubs=False
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
diff --git a/launcher/canonical-hw-collection b/launcher/canonical-hw-collection
deleted file mode 100755
index f9464cf..0000000
--- a/launcher/canonical-hw-collection
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env checkbox-launcher
-# The purpose of this launcher is to gather information about the hardware
-# and submit it to HEXR (Hardware Enablement Cross Referencer).
-# 1- It will just show a welcome screen and prompt for password at the
-#    beginning.
-# 2- It will run all the jobs in the hwsubmit whitelist. They're all
-#    automated and very short, just to collect system data.
-# 3- It will prompt whether to submit to hexr
-# 4- Upon confirmation it will upload data to hexr and provide a URL
-#    to complete adding the system. No secure_id is needed.
-# 5- Once the URL is provided it will exit.
-
-[welcome]
-title = Gathering hardware information
-text = Gathering hardware information.  You may be prompted for your password.
-       This process will take approximately 30 seconds and you will be provided
-       with a URL through which you can confirm and register your hardware
-       submission.
-
-[suite]
-whitelist_filter = ^hwsubmit$
-whitelist_selection = ^hwsubmit$
-skip_whitelist_selection = True
-skip_test_selection = True
-
-[submission]
-# A bogus secure_id ensures we don't ask it, as hexr doesn't need it.
-# It can always be overridden in the .conf file.
-secure_id = 000000000000000
-
-[transport]
-submit_to = certification
-submit_url = https://hexr.canonical.com/checkbox/submit/
diff --git a/launcher/canonical-hw-collection-offline b/launcher/canonical-hw-collection-offline
deleted file mode 100755
index 7900b59..0000000
--- a/launcher/canonical-hw-collection-offline
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env checkbox-launcher
-# The purpose of this launcher is to gather information about the hardware
-# and save it to a local file for later manual collection.
-#
-# 1- It will just show a welcome screen and prompt for password at the
-#    beginning.
-# 2- It will run all the jobs in the hwsubmit whitelist. They're all
-#    automated and very short, just to collect system data.
-# 3- It will save the resulting files/reports in a location under
-#    $HOME/.local, to be indicated when the tool finishes running.
-
-[welcome]
-title = Gathering hardware information
-text = Gathering hardware information.  You may be prompted for your password.
-       This process will take approximately 30 seconds and you will be provided
-       with the location of the file containing your hardware information.
-
-[suite]
-whitelist_filter = ^hwsubmit$
-whitelist_selection = ^hwsubmit$
-skip_whitelist_selection = True
-skip_test_selection = True