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

[Colin Misare]

Some functional and troubleshooting additions

- Splitting out bundle steps to allow more time for both instance creation and ubuntu-advantage subscription attachment
- Print status between steps to allow some basic troubleshooting if subscription attachment fails or if package install fails
- Detach all ubuntu-advantage subscriptions at the end of a test to not explode the count of registered machines

Some functional and troubleshooting additions

- Splitting out bundle steps to allow more time for both instance creation and ubuntu-advantage subscription attachment
- Print status between steps to allow some basic troubleshooting if subscription attachment fails or if package install fails
- Detach all ubuntu-advantage subscriptions at the end of a test to not explode the count of registered machines

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision c2b2853946d0baa4c9ebc3898a06e256986e5759

diff --git a/charm-testing/ubuntu-advantage/bundle.yaml b/charm-testing/ubuntu-advantage/applications.yaml
similarity index 90%
rename from charm-testing/ubuntu-advantage/bundle.yaml
rename to charm-testing/ubuntu-advantage/applications.yaml
index e05b79b..01b5641 100644
--- a/charm-testing/ubuntu-advantage/bundle.yaml
+++ b/charm-testing/ubuntu-advantage/applications.yaml
@@ -16,7 +16,3 @@ applications:
     options:
       ppa: ppa:ua-client/stable
       token: include-file://{{local_dir}}/canonical-is-ua.key
-relations:
-- [xenial, ubuntu-advantage]
-- [bionic, ubuntu-advantage]
-- [focal, ubuntu-advantage]
diff --git a/charm-testing/ubuntu-advantage/install-hello b/charm-testing/ubuntu-advantage/install-hello
index 695bbf4..0d22268 100755
--- a/charm-testing/ubuntu-advantage/install-hello
+++ b/charm-testing/ubuntu-advantage/install-hello
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-juju run --all 'sudo apt install -y hello/$(lsb_release -s -c)-apps-security'
+juju run --all 'sudo apt-get update && sudo apt-get install --yes hello/$(lsb_release -s -c)-apps-security'
diff --git a/charm-testing/ubuntu-advantage/manifest b/charm-testing/ubuntu-advantage/manifest
index 383cd6a..473618f 100644
--- a/charm-testing/ubuntu-advantage/manifest
+++ b/charm-testing/ubuntu-advantage/manifest
@@ -1,2 +1,20 @@
-bundle config=bundle.yaml
+# Deploying charms (creating instances)
+bundle config=applications.yaml
+
+# Deploying relations (performing ubuntu-advantage attachment)
+bundle config=relations.yaml status-settle-wait=30
+
+# Printing attachment status
+script config=print-attachment
+
+# Installing hello package from esm-apps repository
 script config=install-hello
+
+# Printing package install status
+script config=print-hello
+
+# Updating config to unset ubuntu-advantage token
+script config=reset-token
+
+# Allowing instances time to detach
+sleep config=120
diff --git a/charm-testing/ubuntu-advantage/print-attachment b/charm-testing/ubuntu-advantage/print-attachment
new file mode 100755
index 0000000..c51ff38
--- /dev/null
+++ b/charm-testing/ubuntu-advantage/print-attachment
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+juju run --all 'ubuntu-advantage status --all'
diff --git a/charm-testing/ubuntu-advantage/print-hello b/charm-testing/ubuntu-advantage/print-hello
new file mode 100755
index 0000000..7baa7d6
--- /dev/null
+++ b/charm-testing/ubuntu-advantage/print-hello
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+juju run --all 'dpkg --status hello'
diff --git a/charm-testing/ubuntu-advantage/relations.yaml b/charm-testing/ubuntu-advantage/relations.yaml
new file mode 100644
index 0000000..673d80f
--- /dev/null
+++ b/charm-testing/ubuntu-advantage/relations.yaml
@@ -0,0 +1,13 @@
+applications:
+  xenial:
+    charm: cs:ubuntu
+  bionic:
+    charm: cs:ubuntu
+  focal:
+    charm: cs:ubuntu
+  ubuntu-advantage:
+    charm: cs:~ubuntu-advantage-charmers/ubuntu-advantage
+relations:
+- [xenial, ubuntu-advantage]
+- [bionic, ubuntu-advantage]
+- [focal, ubuntu-advantage]
diff --git a/charm-testing/ubuntu-advantage/reset-token b/charm-testing/ubuntu-advantage/reset-token
new file mode 100755
index 0000000..b60edf3
--- /dev/null
+++ b/charm-testing/ubuntu-advantage/reset-token
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+juju config ubuntu-advantage --reset token