diff --git a/ci.bash b/ci.bash index 865767652..0618ac3fe 100644 --- 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/ci-master.yaml b/jobs/ci-master.yaml index 8c3ae8d3a..fed46e48e 100644 --- a/jobs/ci-master.yaml +++ b/jobs/ci-master.yaml @@ -89,7 +89,7 @@ name: juju_channel description: |- specify the juju channel to use - default: 2.9/stable + default: 3.1/stable - parameter: name: series-stable diff --git a/jobs/infra/playbook-jenkins.yml b/jobs/infra/playbook-jenkins.yml index 43a0333f2..9f1a9753a 100644 --- a/jobs/infra/playbook-jenkins.yml +++ b/jobs/infra/playbook-jenkins.yml @@ -128,7 +128,7 @@ - jenkins - adhoc - name: upgrade juju - command: "snap refresh juju --channel 2.9/stable --classic" + command: "snap refresh juju --channel 3.1/stable" ignore_errors: yes tags: - jenkins @@ -153,7 +153,7 @@ - "charmcraft --classic --edge" - "go --classic --stable" - "google-cloud-cli --classic --channel latest/stable" - - "juju --classic --channel=2.9/stable" + - "juju --channel=3.1/stable" - "juju-crashdump --classic --edge" - "juju-wait --classic" - "kubectl --classic" diff --git a/jobs/integration/conftest.py b/jobs/integration/conftest.py index b8bb0ec97..c907d6e3c 100644 --- 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") diff --git a/jobs/validate-offline/playbook.yml b/jobs/validate-offline/playbook.yml index 23188a53d..a81d31bdf 100644 --- a/jobs/validate-offline/playbook.yml +++ b/jobs/validate-offline/playbook.yml @@ -27,7 +27,7 @@ command: "snap install {{item}}" ignore_errors: yes loop: - - "juju --classic --channel=2.9/stable" + - "juju --channel=3.1/stable" - "juju-wait --classic" - "lxd" tags: diff --git a/jobs/validate.yaml b/jobs/validate.yaml index cffe6e285..b81af2a6d 100644 --- a/jobs/validate.yaml +++ b/jobs/validate.yaml @@ -33,8 +33,8 @@ description: |- specify the juju channel to use values: - - 2.9/stable - 3.1/stable + - 3.3/stable - axis: type: user-defined name: snap_version @@ -751,7 +751,11 @@ - snap-edge - series-stable - lxc-runner-params - - juju-lts + - string: + name: juju_channel + description: |- + specify the juju channel to use + default: 2.9/stable - string: name: LXC_SNAP_LIST description: |- diff --git a/jobs/validate/playbooks/single-system.yml b/jobs/validate/playbooks/single-system.yml index b59f742ab..7dade5811 100644 --- a/jobs/validate/playbooks/single-system.yml +++ b/jobs/validate/playbooks/single-system.yml @@ -34,7 +34,7 @@ command: "snap install {{item}}" ignore_errors: yes loop: - - "juju --classic --channel=2.9/stable" + - "juju --channel=3.1/stable" - "juju-wait --classic" - "juju-crashdump --classic --edge" - "lxd" diff --git a/requirements.txt b/requirements.txt index 030e46dd8..b8f195f05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -110,7 +110,7 @@ jmespath==1.0.1 # via # boto3 # botocore -juju==3.2.3.0 +juju==3.3.0.0 # via -r requirements.in kubernetes==26.1.0 # via juju