juju33 deprecates destroy-model '-y'

charmed-kubernetes · Feb 7, 2024 · 5c5e2d5 · 5c5e2d5
1 parent eefe309
commit 5c5e2d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ci.bash b/ci.bash
@@ -254,8 +254,8 @@ function ci::cleanup::before
 
 function ci::cleanup::model::addons
 {
-    if ! timeout 10m juju destroy-model -y --destroy-storage "$JUJU_CONTROLLER:addons"; then
-      timeout 10m juju destroy-model -y --destroy-storage "$JUJU_CONTROLLER:addons" --force
+    if ! timeout 10m juju destroy-model --no-prompt --destroy-storage "$JUJU_CONTROLLER:addons"; then
+      timeout 10m juju destroy-model --no-prompt --destroy-storage "$JUJU_CONTROLLER:addons" --force
     fi
 }
 

diff --git a/jobs/integration/conftest.py b/jobs/integration/conftest.py
@@ -403,7 +403,7 @@ async def k8s_model(k8s_cloud, tools):
                 "--destroy-storage",
                 "--force",
                 "--no-wait",
-                "-y",
+                "--no-prompt",
                 tools.k8s_connection,
             )
 
@@ -541,7 +541,7 @@ async def deploy(request, tools):
     await _model_obj.connect(f"{tools.controller_name}:{nonce_model}")
     yield (tools.controller_name, _model_obj)
     await _model_obj.disconnect()
-    await tools.run("juju", "destroy-model", "-y", nonce_model)
+    await tools.run("juju", "destroy-model", "--no-prompt", nonce_model)
 
 
 @pytest.fixture(scope="module")