[DPE-4811] Enforce Juju versions (#544)

* Enforce Juju versions Signed-off-by: Marcelo Henrique Neppel <[email protected]> * Upgrade to Juju 3.4.3 Signed-off-by: Marcelo Henrique Neppel <[email protected]> * Fix test_redeploy_charm_same_model_after_forcing_removal Signed-off-by: Marcelo Henrique Neppel <[email protected]> * Change constraint to Juju 3.5.1 Signed-off-by: Marcelo Henrique Neppel <[email protected]> --------- Signed-off-by: Marcelo Henrique Neppel <[email protected]>
canonical · Jul 9, 2024 · cf45c2d · cf45c2d
1 parent c4bcff5
commit cf45c2d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -56,13 +56,13 @@ jobs:
           - agent: 2.9.49  # renovate: juju-agent-pin-minor
             libjuju: ==2.9.49.0  # renovate: latest libjuju 2
             allure_on_amd64: false
-          - agent: 3.1.8  # renovate: juju-agent-pin-minor
+          - agent: 3.4.3  # renovate: juju-agent-pin-minor
             allure_on_amd64: true
         architecture:
           - amd64
         include:
           - juju:
-              agent: 3.1.8  # renovate: juju-agent-pin-minor
+              agent: 3.4.3  # renovate: juju-agent-pin-minor
               allure_on_amd64: true
             architecture: arm64
     name: Integration test charm | ${{ matrix.juju.agent }} | ${{ matrix.architecture }}

diff --git a/metadata.yaml b/metadata.yaml
@@ -83,3 +83,13 @@ storage:
 
 assumes:
   - k8s-api
+  - any-of:
+      - all-of:
+          - juju >= 2.9.49
+          - juju < 3
+      - all-of:
+          - juju >= 3.4.3
+          - juju < 3.5
+      - all-of:
+          - juju >= 3.5.1
+          - juju < 4
diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -404,7 +404,7 @@ async def test_redeploy_charm_same_model(ops_test: OpsTest):
 async def test_redeploy_charm_same_model_after_forcing_removal(ops_test: OpsTest) -> None:
     """Redeploy the charm in the same model to test that it works after a forceful removal."""
     return_code, _, stderr = await ops_test.juju(
-        "remove-application", APP_NAME, "--destroy-storage", "--force", "--no-wait"
+        "remove-application", APP_NAME, "--destroy-storage", "--force", "--no-prompt", "--no-wait"
     )
     if return_code != 0:
         assert False, stderr