Merge ~bladernr/plainbox-provider-certification-server:revert-launcher-change into plainbox-provider-certification-server:master

Proposed by Jeff Lane 
Status: Merged
Merged at revision: 5a8f461262aa80720f9779f22dbaf56ad6346e1b
Proposed branch: ~bladernr/plainbox-provider-certification-server:revert-launcher-change
Merge into: plainbox-provider-certification-server:master
Diff against target: 24 lines (+2/-6)
1 file modified
launcher/canonical-certification-server (+2/-6)
Reviewer Review Type Date Requested Status
Jeff Lane  Needs Fixing
Review via email: mp+308272@code.launchpad.net

Description of the change

reverts changes to the launcher that accidentally found their way into an unrelated MR and broke launchers.

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

self-approve for hotfix

review: Approve
Revision history for this message
Jeff Lane  (bladernr) wrote :

The merge was fine but running tests failed.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/launcher/canonical-certification-server b/launcher/canonical-certification-server
2index 029ca14..d1d4138 100755
3--- a/launcher/canonical-certification-server
4+++ b/launcher/canonical-certification-server
5@@ -1,17 +1,13 @@
6-#!/bin/bash
7+#!/usr/bin/env checkbox-cli
8
9-RELEASE=`lsb_release -r |cut -f 2`
10-
11-cat << EOF | /usr/bin/env checkbox-cli
12 [launcher]
13 app_id = 2013.com.canonical.certification:certification-server
14 launcher_version = 1
15 stock_reports = text, submission_files, certification
16
17 [test plan]
18-unit = 2013.com.canonical.certification::$RELEASE-server-full
19+unit = 2013.com.canonical.certification::16.04-server-full
20 filter = *-server-*, *-only, *virtual*, *firmware-tests
21
22 [config]
23 config_filename = canonical-certification.conf
24-EOF

Subscribers

People subscribed via source and target branches