Juju Charms Collection
juju-gui package

Merge lp:~ibm-demo/charms/trusty/juju-gui/trunk into lp:charms/juju-gui

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Tim Van Steenburgh
Status: Merged
Merged at revision: 101
Proposed branch: lp:~ibm-demo/charms/trusty/juju-gui/trunk
Merge into: lp:charms/juju-gui
Diff against target: 63 lines (+18/-1)
3 files modified
config.yaml (+4/-0)
metadata.yaml (+1/-1)
tests/tests.yaml (+13/-0)
To merge this branch: bzr merge lp:~ibm-demo/charms/trusty/juju-gui/trunk
Reviewer Review Type Date Requested Status
Richard Harding Approve
Review via email: mp+240048@code.launchpad.net

Description of the change

1. Update config.yaml to pass `charm proof`
2. Update tests.yaml so that tests are executed properly (and pass!) when run by the automated test runner. For more info on the automated test runner see: http://blog.juju.solutions/cloud/juju/2014/10/02/charm-testing.html

To post a comment you must log in.
Revision history for this message
Richard Harding (rharding) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-04-15 14:17:12 +0000
3+++ config.yaml 2014-10-29 19:39:45 +0000
4@@ -66,17 +66,20 @@
5 the GUI. Both ssl-cert-contents and ssl-key-contents must be provided.
6 If not, cetificates will be automatically generated.
7 type: string
8+ default:
9 ssl-key-contents:
10 description: |
11 The contents of the private key file to be used in SSL connections to
12 the GUI. Both ssl-cert-contents and ssl-key-contents must be provided.
13 If not, cetificates will be automatically generated.
14 type: string
15+ default:
16 login-help:
17 description: |
18 The help text shown to the user on the login screen. If not provided, a
19 default message is used, suggesting how to find the login credentials.
20 type: string
21+ default:
22 read-only:
23 description: |
24 Whether or not the GUI is in read-only mode. Note that read-only mode is
25@@ -103,6 +106,7 @@
26 If given, the password to use for the environment to immediately
27 connect. Do not set unless you understand and accept the risks.
28 type: string
29+ default:
30 sandbox:
31 description: |
32 Run using an in-memory sandbox rather than a real Juju backend. Sandbox
33
34=== modified file 'metadata.yaml'
35--- metadata.yaml 2013-07-29 21:39:43 +0000
36+++ metadata.yaml 2014-10-29 19:39:45 +0000
37@@ -18,7 +18,7 @@
38 summary: User interface for Juju (development)
39 maintainer: Juju GUI Team <juju-gui@lists.launchpad.net>
40 description: Web GUI for Juju
41-categories: ["applications"]
42+tags: ["ops"]
43 provides:
44 web:
45 interface: http
46
47=== added file 'tests/tests.yaml'
48--- tests/tests.yaml 1970-01-01 00:00:00 +0000
49+++ tests/tests.yaml 2014-10-29 19:39:45 +0000
50@@ -0,0 +1,13 @@
51+bootstrap: false
52+reset: false
53+tests: "none"
54+packages:
55+ - build-essential
56+ - bzr
57+ - libapt-pkg-dev
58+ - libpython-dev
59+ - python-virtualenv
60+ - rsync
61+ - xvfb
62+ - charm-tools
63+ - firefox

Subscribers

People subscribed via source and target branches