Fix launchers (Kittyhawk, Stella, Somerville, Sutton) to specify the config

file to use 

4 files changed, 23 insertions, 38 deletions

diff --git a/scripts/kittyhawk-cli b/scripts/kittyhawk-cli
index 7166f18..f51c7ad 100755
--- a/scripts/kittyhawk-cli
+++ b/scripts/kittyhawk-cli
@@ -1,22 +1,11 @@
-#!/usr/bin/env checkbox-launcher
-[welcome]
-text = Welcome to Canonical System Testing!
- 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.canonical.com database.
- To learn how to create or locate the Secure ID, please see here:
- https://certification.canonical.com/
+#!/usr/bin/env checkbox-cli
 
-[suite]
-# Whitelist(s) displayed in the suite selection screen
-whitelist_filter = ^kittyhawk.*$
-# Whitelist(s) pre-selected in the suite selection screen, default whitelist(s)
-# "bogus" means no whitelist will be preselected.
-whitelist_selection = ^bogus$
+[launcher]
+launcher_version = 1
+app_id = 2016.com.canonical.certification:kittyhawk-testing
 
-[submission]
-submit_to_hexr = true
+[test plan]
+filter = *kittyhawk*
 
-[transport]
-submit_to = certification
+[config]
+config_filename = plainbox.conf
diff --git a/scripts/somerville-cli b/scripts/somerville-cli
index a5f639e..25b52fb 100755
--- a/scripts/somerville-cli
+++ b/scripts/somerville-cli
@@ -7,3 +7,6 @@ app_id = 2016.com.canonical.certification:somerville-testing
 [test plan]
 filter = *somerville*
 unit = 2014.com.canonical.ce::somerville-full
+
+[config]
+config_filename = plainbox.conf
diff --git a/scripts/stella-cli b/scripts/stella-cli
index 3f63a1e..42e583b 100755
--- a/scripts/stella-cli
+++ b/scripts/stella-cli
@@ -7,3 +7,6 @@ app_id = 2016.com.canonical.certification:stella-testing
 [test plan]
 filter = *stella*
 unit = 2014.com.canonical.ce::stella-full-14-04-3
+
+[config]
+config_filename = plainbox.conf
diff --git a/scripts/sutton-cli b/scripts/sutton-cli
index a83c7e8..b5dd697 100755
--- a/scripts/sutton-cli
+++ b/scripts/sutton-cli
@@ -1,22 +1,12 @@
-#!/usr/bin/env checkbox-launcher
-[welcome]
-text = Welcome to Canonical System Testing!
- 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.canonical.com database.
- To learn how to create or locate the Secure ID, please see here:
- https://certification.canonical.com/
+#!/usr/bin/env checkbox-cli
 
-[suite]
-# Whitelist(s) displayed in the suite selection screen
-whitelist_filter = ^sutton.*$
-# Whitelist(s) pre-selected in the suite selection screen, default whitelist(s)
-# "bogus" means no whitelist will be preselected.
-whitelist_selection = ^bogus$
+[launcher]
+launcher_version = 1
+app_id = 2016.com.canonical.certification:sutton-testing
 
-[submission]
-submit_to_hexr = true
+[test plan]
+filter = *sutton*
+unit = 2014.com.canonical.ce::sutton-full-14-04-3
 
-[transport]
-submit_to = certification
+[config]
+config_filename = plainbox.conf