[DPE-5565] Pin rev137 for ZK in tests

canonical · Sep 27, 2024 · dafa21d · dafa21d
1 parent 50176da
commit dafa21d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -47,6 +47,7 @@ async def test_build_and_deploy_same_machine(ops_test: OpsTest, kafka_charm):
             channel="edge",
             application_name=SAME_ZK,
             num_units=1,
+            revision=137,
             series="jammy",
             to=machine_ids[0],
         ),
@@ -94,7 +95,9 @@ async def test_build_and_deploy(ops_test: OpsTest, kafka_charm):
             storage={"data": {"pool": "test_pool", "size": 10240}},
         ),
         ops_test.model.deploy(
-            ZK_NAME, channel="edge", application_name=ZK_NAME, num_units=1, series="jammy"
+            ZK_NAME, channel="edge",
+            application_name=ZK_NAME, num_units=1, series="jammy",
+            revision=137
         ),
     )
     await ops_test.model.wait_for_idle(apps=[APP_NAME, ZK_NAME], idle_period=30, timeout=3600)

diff --git a/tests/integration/test_password_rotation.py b/tests/integration/test_password_rotation.py
@@ -21,7 +21,8 @@
 async def test_build_and_deploy(ops_test: OpsTest, kafka_charm, app_charm):
     await asyncio.gather(
         ops_test.model.deploy(
-            ZK_NAME, channel="edge", application_name=ZK_NAME, num_units=3, series="jammy"
+            ZK_NAME, channel="edge", revision=137,
+            application_name=ZK_NAME, num_units=3, series="jammy"
         ),
         ops_test.model.deploy(kafka_charm, application_name=APP_NAME, num_units=1, series="jammy"),
         ops_test.model.deploy(app_charm, application_name=DUMMY_NAME, num_units=1, series="jammy"),

diff --git a/tests/integration/test_provider.py b/tests/integration/test_provider.py
@@ -38,7 +38,7 @@ async def test_deploy_charms_relate_active(
     """Test deploy and relate operations."""
     await asyncio.gather(
         ops_test.model.deploy(
-            "zookeeper", channel="edge", application_name=ZK, num_units=3, series="jammy"
+            "zookeeper", channel="edge", revision=137, application_name=ZK, num_units=3, series="jammy"
         ),
         ops_test.model.deploy(kafka_charm, application_name=APP_NAME, num_units=1, series="jammy"),
         ops_test.model.deploy(

diff --git a/tests/integration/test_scaling.py b/tests/integration/test_scaling.py
@@ -19,7 +19,7 @@
 async def test_kafka_simple_scale_up(ops_test: OpsTest, kafka_charm):
     await asyncio.gather(
         ops_test.model.deploy(
-            ZK, channel="edge", application_name=ZK, num_units=1, series="jammy"
+            ZK, channel="edge", application_name=ZK, revision=137, num_units=1, series="jammy"
         ),
         ops_test.model.deploy(
             kafka_charm, application_name=CHARM_KEY, num_units=1, series="jammy"

diff --git a/tests/integration/test_tls.py b/tests/integration/test_tls.py
@@ -46,7 +46,7 @@ async def test_deploy_tls(ops_test: OpsTest, kafka_charm):
 
     await asyncio.gather(
         ops_test.model.deploy(TLS_NAME, channel="edge", config=tls_config, series="jammy"),
-        ops_test.model.deploy(ZK, channel="edge", series="jammy", application_name=ZK),
+        ops_test.model.deploy(ZK, channel="edge", revision=137, series="jammy", application_name=ZK),
         ops_test.model.deploy(
             kafka_charm,
             application_name=CHARM_KEY,

diff --git a/tests/integration/test_upgrade.py b/tests/integration/test_upgrade.py
@@ -29,6 +29,7 @@ async def test_in_place_upgrade(ops_test: OpsTest, kafka_charm, app_charm):
         ops_test.model.deploy(
             ZK_NAME,
             channel="3/edge",
+            revision=137,
             application_name=ZK_NAME,
             num_units=1,
         ),