Skip to content

Commit 48fd2a9

Browse files
fourdollarsCopilot
andcommitted
fix(ci): correct juju destroy-model/controller syntax for Juju 3.x
Use '--no-prompt' (not '-y'/'--yes') and place all flags before the model/controller name argument, matching Juju 3.x CLI conventions: juju destroy-model --no-prompt --force --no-wait <model> juju destroy-controller --no-prompt --destroy-all-models --force --no-wait <controller> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent d225405 commit 48fd2a9

1 file changed

Lines changed: 30 additions & 30 deletions

File tree

.github/workflows/test.yaml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ jobs:
191191
- name: Cleanup
192192
if: always()
193193
run: |
194-
juju destroy-model test-openclaw --yes --force --no-wait || true
195-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
194+
juju destroy-model --no-prompt --force --no-wait test-openclaw || true
195+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
196196
197197
test-channels:
198198
name: Test Messaging Channel Configuration
@@ -279,8 +279,8 @@ jobs:
279279
- name: Cleanup
280280
if: always()
281281
run: |
282-
juju destroy-model test-channels --yes --force --no-wait || true
283-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
282+
juju destroy-model --no-prompt --force --no-wait test-channels || true
283+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
284284
285285
test-multi-model-config:
286286
name: Test Multi-Model Configuration
@@ -382,8 +382,8 @@ jobs:
382382
- name: Cleanup
383383
if: always()
384384
run: |
385-
juju destroy-model test-models --yes --force --no-wait || true
386-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
385+
juju destroy-model --no-prompt --force --no-wait test-models || true
386+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
387387
388388
389389
test-config-preservation:
@@ -590,8 +590,8 @@ jobs:
590590
- name: Cleanup
591591
if: always()
592592
run: |
593-
juju destroy-model test-config-preservation --yes --force --no-wait || true
594-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
593+
juju destroy-model --no-prompt --force --no-wait test-config-preservation || true
594+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
595595
596596
test-upgrade:
597597
name: Test Charm Upgrade
@@ -659,8 +659,8 @@ jobs:
659659
- name: Cleanup
660660
if: always()
661661
run: |
662-
juju destroy-model test-upgrade --yes --force --no-wait || true
663-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
662+
juju destroy-model --no-prompt --force --no-wait test-upgrade || true
663+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
664664
665665
test-auto-update:
666666
name: Test Auto-Update Functionality
@@ -959,8 +959,8 @@ jobs:
959959
- name: Cleanup
960960
if: always()
961961
run: |
962-
juju destroy-model test-auto-update --yes --force --no-wait || true
963-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
962+
juju destroy-model --no-prompt --force --no-wait test-auto-update || true
963+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
964964
965965
test-browser:
966966
name: Test Browser Functionality (Chrome)
@@ -1318,8 +1318,8 @@ jobs:
13181318
- name: Cleanup
13191319
if: always()
13201320
run: |
1321-
juju destroy-model test-browser --yes --force --no-wait || true
1322-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
1321+
juju destroy-model --no-prompt --force --no-wait test-browser || true
1322+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
13231323
13241324
test-manual-mode:
13251325
name: Test Manual Configuration Mode
@@ -1467,8 +1467,8 @@ jobs:
14671467
- name: Cleanup
14681468
if: always()
14691469
run: |
1470-
juju destroy-model test-manual --yes --force --no-wait || true
1471-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
1470+
juju destroy-model --no-prompt --force --no-wait test-manual || true
1471+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
14721472
14731473
test-version-config:
14741474
name: Test Version Config
@@ -1602,8 +1602,8 @@ jobs:
16021602
- name: Cleanup
16031603
if: always()
16041604
run: |
1605-
juju destroy-model test-version-config --yes --force --no-wait || true
1606-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
1605+
juju destroy-model --no-prompt --force --no-wait test-version-config || true
1606+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
16071607
16081608
test-node-version-config:
16091609
name: Test Node Version Config
@@ -1715,8 +1715,8 @@ jobs:
17151715
- name: Cleanup
17161716
if: always()
17171717
run: |
1718-
juju destroy-model test-node-version-config --yes --force --no-wait || true
1719-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
1718+
juju destroy-model --no-prompt --force --no-wait test-node-version-config || true
1719+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
17201720
17211721
test-default-allowed-origins:
17221722
name: Test Default control-ui-allowed-origins
@@ -1838,8 +1838,8 @@ jobs:
18381838
- name: Cleanup
18391839
if: always()
18401840
run: |
1841-
juju destroy-model test-default-origins --yes --force --no-wait || true
1842-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
1841+
juju destroy-model --no-prompt --force --no-wait test-default-origins || true
1842+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
18431843
18441844
test-context-window:
18451845
name: Test AI Context Window Configuration
@@ -2083,8 +2083,8 @@ jobs:
20832083
- name: Cleanup
20842084
if: always()
20852085
run: |
2086-
juju destroy-model test-context-window --yes --force --no-wait || true
2087-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
2086+
juju destroy-model --no-prompt --force --no-wait test-context-window || true
2087+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
20882088
20892089
test-ai-providers-order:
20902090
name: Test AI Providers Order
@@ -2170,8 +2170,8 @@ jobs:
21702170
- name: Cleanup
21712171
if: always()
21722172
run: |
2173-
juju destroy-model test-order --yes --force --no-wait || true
2174-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
2173+
juju destroy-model --no-prompt --force --no-wait test-order || true
2174+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
21752175
21762176
test-system-upgrade-action:
21772177
name: Test System Upgrade Action
@@ -2272,8 +2272,8 @@ jobs:
22722272
- name: Cleanup
22732273
if: always()
22742274
run: |
2275-
juju destroy-model test-system-upgrade --yes --force --no-wait || true
2276-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
2275+
juju destroy-model --no-prompt --force --no-wait test-system-upgrade || true
2276+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true
22772277
22782278
test-backup:
22792279
name: Test Backup Action
@@ -2361,5 +2361,5 @@ jobs:
23612361
- name: Cleanup
23622362
if: always()
23632363
run: |
2364-
juju destroy-model test-backup --yes --force --no-wait || true
2365-
juju destroy-controller test-controller --yes --destroy-all-models --force --no-wait || true
2364+
juju destroy-model --no-prompt --force --no-wait test-backup || true
2365+
juju destroy-controller --no-prompt --destroy-all-models --force --no-wait test-controller || true

0 commit comments

Comments
 (0)