Merge pull request #14433 from wallyworld/cktest-controller-name

Fix controller name in ck test teardown
juju · Aug 6, 2022 · b2d5fae · b2d5fae
2 parents 34541a8 + 0c26704
commit b2d5fae
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tests/suites/ck/task.sh b/tests/suites/ck/task.sh
@@ -18,6 +18,8 @@ test_ck() {
 
 	test_deploy_ck
 
-	# CK takes too long to tear down (1h+), so forcibly destroy it
-	juju kill-controller -y -t 0s "test-ck" || true
+	if [[ ${BOOTSTRAP_REUSE:-} != "true" ]]; then
+		# CK takes too long to tear down (1h+), so forcibly destroy it
+		juju kill-controller -y -t 0 "${BOOTSTRAPPED_JUJU_CTRL_NAME}" || true
+	fi
 }