Clean up offers

During the cleaning up of integration tests, where the test "framework" destroys the controllers, if there are any outstanding offers in the controller then the destroying of the controller will hang for ever! The fix is quite simple, before the actual destruction of a model, walk over all the controllers and remove all the offers. It's quite a slow process esp. with AWS, but it does mean that we don't have any orphaned controllers. In fact this is how a normal operator is supposed to handle a controller destruction.
sdg0919 · Feb 10, 2020 · b6e8191 · b6e8191
1 parent 65e6ac8
commit b6e8191
Showing 1 changed file with 31 additions and 0 deletions.
diff --git a/tests/includes/juju.sh b/tests/includes/juju.sh
@@ -227,6 +227,18 @@ destroy_controller() {
 
     echo "====> Introspection gathered"
 
+    # Unfortunately having any offers on a model, leads to failure to clean
+    # up a controller.
+    # See discussion under https://bugs.launchpad.net/juju/+bug/1830292.
+    echo "====> Removing offers"
+
+    set +e
+    remove_controller_offers "${name}"
+    set_verbosity
+
+    echo "====> Removed offers"
+
+
     output="${TEST_DIR}/${name}-destroy-controller.txt"
 
     echo "====> Destroying juju ($(green "${name}"))"
@@ -268,3 +280,22 @@ introspect_controller() {
     echo "${idents}" | xargs -I % juju ssh -m "${name}:controller" % bash -lc "juju_engine_report" > "${TEST_DIR}/${name}-juju_engine_reports.txt"
     echo "${idents}" | xargs -I % juju ssh -m "${name}:controller" % bash -lc "juju_goroutines" > "${TEST_DIR}/${name}-juju_goroutines.txt"
 }
+
+remove_controller_offers() {
+    local name
+
+    name=${1}
+
+    OUT=$(juju models -c ${name} --format=json | jq -r ".[\"models\"] | .[] | select(.[\"is-controller\"] == false) | .name" || true)
+    if [ -n "${OUT}" ]; then
+        echo "${OUT}" | while read -r model; do
+            OUT=$(juju offers -m "${name}:${model}" --format=json | jq -r ".[] | .[\"offer-url\"]" || true)
+            echo "${OUT}" | while read -r offer; do
+                if [ -n "${offer}" ]; then
+                    juju remove-offer -c "${name}" "${offer}"
+                    echo "${offer}" >> "${TEST_DIR}/${name}-juju_removed_offers.txt"
+                fi
+            done
+        done
+    fi
+}