Bootstrapping correctly for 3.1.6 -- EnterScope should B gone

canonical · Sep 21, 2023 · 1955e78 · 1955e78
1 parent 21d0ed3
commit 1955e78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -67,7 +67,7 @@ jobs:
           - juju-bootstrap-option: "2.9.44"
             juju-snap-channel: "2.9/stable"
             libjuju-version: "2.9.42.4"
-          - juju-bootstrap-option: "3.1.5"
+          - juju-bootstrap-option: "3.1.6"
             juju-snap-channel: "3.1/edge"
             libjuju-version: "3.2.0.1"
     name: ${{ matrix.tox-environments }} Juju ${{ matrix.juju-version.juju-snap-channel}} -- libjuju ${{ matrix.juju-version.libjuju-version }}

diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -38,7 +38,7 @@ async def test_deploy_charms(ops_test: OpsTest, application_charm, database_char
     # set data in the relation application databag using only the leader unit).
     await asyncio.gather(
         ops_test.model.deploy(
-            application_charm, application_name=APPLICATION_APP_NAME, num_units=1, series="jammy"
+            application_charm, application_name=APPLICATION_APP_NAME, num_units=2, series="jammy"
         ),
         ops_test.model.deploy(
             database_charm,
@@ -48,7 +48,7 @@ async def test_deploy_charms(ops_test: OpsTest, application_charm, database_char
                 ]
             },
             application_name=DATABASE_APP_NAME,
-            num_units=1,
+            num_units=2,
             series="jammy",
         ),
         ops_test.model.deploy(
@@ -63,7 +63,7 @@ async def test_deploy_charms(ops_test: OpsTest, application_charm, database_char
         ),
     )
     await ops_test.model.wait_for_idle(
-        apps=[APPLICATION_APP_NAME, DATABASE_APP_NAME], status="active", wait_for_exact_units=1
+        apps=[APPLICATION_APP_NAME, DATABASE_APP_NAME], status="active", wait_for_exact_units=2
     )
     await ops_test.model.wait_for_idle(
         apps=[ANOTHER_DATABASE_APP_NAME], status="active", wait_for_exact_units=1