Merge lp:~hloeung/mojo/mojo-specs-multiple-clouds into lp:mojo/mojo-specs

[Haw Loeung]

Handle when CI environment has multiple clouds

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

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

[Thomas Cuthbert (tcuthbert)]

+1

review: Approve

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

Change has no commit message, setting status to needs review.

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

Change successfully merged at revision 162

=== modified file 'charm-testing/redeploy-model'
--- charm-testing/redeploy-model	2017-09-04 11:27:05 +0000
+++ charm-testing/redeploy-model	2020-03-26 00:42:54 +0000
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+[ -n "$CLOUD_NAME" ] || if [ -f ${HOME}/.local/share/mojo/cloud_name ]; then CLOUD_NAME=$(cat ${HOME}/.local/share/mojo/cloud_name); fi
+
 echo "About to run: juju destroy-model -y ${MODEL_NAME}"
 juju destroy-model -y ${MODEL_NAME}
 echo "Waiting for 1 minute to avoid lp#1709324"
 sleep 1m
-echo "About to run: juju add-model ${MODEL_NAME}"
-juju add-model ${MODEL_NAME}
+echo "About to run: juju add-model ${MODEL_NAME} ${CLOUD_NAME}"
+juju add-model ${MODEL_NAME} ${CLOUD_NAME}
 echo "Completed recreating model"