Merge ~cmisare/mojo/+git/mojo-specs:master into ~mojo-maintainers/mojo/+git/mojo-specs:master

Proposed by Colin Misare
Status: Merged
Approved by: Tom Haddon
Approved revision: 52386621e0e0f3dbaf8d52d4b5c258ebcd26474c
Merged at revision: 2f3ca1ff8f03168d36c41f3b3801c7416a9db09e
Proposed branch: ~cmisare/mojo/+git/mojo-specs:master
Merge into: ~mojo-maintainers/mojo/+git/mojo-specs:master
Diff against target: 45 lines (+27/-0)
3 files modified
charm-testing/ubuntu-advantage/bundle.yaml (+22/-0)
charm-testing/ubuntu-advantage/install-hello (+3/-0)
charm-testing/ubuntu-advantage/manifest (+2/-0)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+397913@code.launchpad.net

Commit message

initial bundle for testing the ubuntu-advantage charm

Description of the change

initial bundle for testing the ubuntu-advantage charm

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 2f3ca1ff8f03168d36c41f3b3801c7416a9db09e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm-testing/ubuntu-advantage/bundle.yaml b/charm-testing/ubuntu-advantage/bundle.yaml
2new file mode 100644
3index 0000000..e05b79b
4--- /dev/null
5+++ b/charm-testing/ubuntu-advantage/bundle.yaml
6@@ -0,0 +1,22 @@
7+applications:
8+ xenial:
9+ charm: cs:ubuntu
10+ series: xenial
11+ num_units: 15
12+ bionic:
13+ charm: cs:ubuntu
14+ series: bionic
15+ num_units: 15
16+ focal:
17+ charm: cs:ubuntu
18+ series: focal
19+ num_units: 15
20+ ubuntu-advantage:
21+ charm: cs:~ubuntu-advantage-charmers/ubuntu-advantage
22+ options:
23+ ppa: ppa:ua-client/stable
24+ token: include-file://{{local_dir}}/canonical-is-ua.key
25+relations:
26+- [xenial, ubuntu-advantage]
27+- [bionic, ubuntu-advantage]
28+- [focal, ubuntu-advantage]
29diff --git a/charm-testing/ubuntu-advantage/install-hello b/charm-testing/ubuntu-advantage/install-hello
30new file mode 100755
31index 0000000..695bbf4
32--- /dev/null
33+++ b/charm-testing/ubuntu-advantage/install-hello
34@@ -0,0 +1,3 @@
35+#!/usr/bin/env bash
36+
37+juju run --all 'sudo apt install -y hello/$(lsb_release -s -c)-apps-security'
38diff --git a/charm-testing/ubuntu-advantage/manifest b/charm-testing/ubuntu-advantage/manifest
39new file mode 100644
40index 0000000..383cd6a
41--- /dev/null
42+++ b/charm-testing/ubuntu-advantage/manifest
43@@ -0,0 +1,2 @@
44+bundle config=bundle.yaml
45+script config=install-hello

Subscribers

People subscribed via source and target branches

to all changes: