juju-ci-tools

Merge lp:~nskaggs/juju-ci-tools/add-term-charms into lp:juju-ci-tools/repository

  1. add-term-charms
  2. Merge into repository
Proposed by Nicholas Skaggs
Status: Work in progress
Proposed branch: lp:~nskaggs/juju-ci-tools/add-term-charms
Merge into: lp:juju-ci-tools/repository
Diff against target: 47 lines (+17/-0)
5 files modified
charms/canonical-terms-example/.ignored (+1/-0)
charms/canonical-terms-example/config.yaml (+5/-0)
charms/canonical-terms-example/hooks/install (+2/-0)
charms/canonical-terms-example/metadata.yaml (+8/-0)
charms/canonical-terms-example/revision (+1/-0)
To merge this branch: bzr merge lp:~nskaggs/juju-ci-tools/add-term-charms
Reviewer Review Type Date Requested Status
Juju Release Engineering Pending
Review via email: mp+321314@code.launchpad.net

Description of the change

This adds charms needed for the new terms, metrics and plans charms testing.

To post a comment you must log in.
lp:~nskaggs/juju-ci-tools/add-term-charms updated
85. By Nicholas Skaggs

merge trunk

Unmerged revisions

85. By Nicholas Skaggs

merge trunk

84. By Nicholas Skaggs

add canonical terms

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'charms/canonical-terms-example'
2=== added directory 'charms/canonical-terms-example/.dir'
3=== added file 'charms/canonical-terms-example/.dir/ignored'
4=== added file 'charms/canonical-terms-example/.ignored'
5--- charms/canonical-terms-example/.ignored 1970-01-01 00:00:00 +0000
6+++ charms/canonical-terms-example/.ignored 2017-03-29 15:33:33 +0000
7@@ -0,0 +1,1 @@
8+#
9\ No newline at end of file
10
11=== added file 'charms/canonical-terms-example/config.yaml'
12--- charms/canonical-terms-example/config.yaml 1970-01-01 00:00:00 +0000
13+++ charms/canonical-terms-example/config.yaml 2017-03-29 15:33:33 +0000
14@@ -0,0 +1,5 @@
15+options:
16+ title: {default: My Title, description: A descriptive title used for the service., type: string}
17+ outlook: {description: No default outlook., type: string}
18+ username: {default: admin001, description: The name of the initial account (given admin permissions)., type: string}
19+ skill-level: {description: A number indicating skill., type: int}
20
21=== added directory 'charms/canonical-terms-example/hooks'
22=== added file 'charms/canonical-terms-example/hooks/install'
23--- charms/canonical-terms-example/hooks/install 1970-01-01 00:00:00 +0000
24+++ charms/canonical-terms-example/hooks/install 2017-03-29 15:33:33 +0000
25@@ -0,0 +1,2 @@
26+#!/bin/bash
27+echo "Done!"
28
29=== added file 'charms/canonical-terms-example/metadata.yaml'
30--- charms/canonical-terms-example/metadata.yaml 1970-01-01 00:00:00 +0000
31+++ charms/canonical-terms-example/metadata.yaml 2017-03-29 15:33:33 +0000
32@@ -0,0 +1,8 @@
33+name: canonical-terms-example
34+summary: "Example charm demonstrating multiple terms."
35+description: |
36+ This charm demonstrates requiring agreements to more than one term as a
37+ precondition of deploying a charm.
38+terms:
39+ - "lorem-ipsum"
40+ - "canonical"
41
42=== added file 'charms/canonical-terms-example/revision'
43--- charms/canonical-terms-example/revision 1970-01-01 00:00:00 +0000
44+++ charms/canonical-terms-example/revision 2017-03-29 15:33:33 +0000
45@@ -0,0 +1,1 @@
46+1
47\ No newline at end of file

Subscribers

People subscribed via source and target branches