Merge branch '6/edge' into shard-removal-test

canonical · Oct 27, 2023 · a802dbe · a802dbe
2 parents eac5377 + 3dcab70
commit a802dbe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,4 +1,4 @@
-name: Release to latest/edge
+name: Release to 6/edge
 
 on:
   push:
@@ -19,7 +19,7 @@ jobs:
     name: Build charm
     uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v5
     with:
-      charmcraft-snap-channel: "latest/edge"
+      charmcraft-snap-channel: "latest/stable"
 
   release:
     name: Release charm

diff --git a/tests/integration/sharding_tests/helpers.py b/tests/integration/sharding_tests/helpers.py
@@ -49,7 +49,7 @@ def verify_data_mongodb(client, db_name, coll_name, key, value) -> bool:
 def get_cluster_shards(mongos_client) -> set:
     """Returns a set of the shard members."""
     shard_list = mongos_client.admin.command("listShards")
-    curr_members = [member["_id"] for member in shard_list["shards"]]
+    curr_members = [member["host"].split("/")[0] for member in shard_list["shards"]]
     return set(curr_members)
 
 

diff --git a/tests/integration/sharding_tests/test_sharding.py b/tests/integration/sharding_tests/test_sharding.py
@@ -278,17 +278,17 @@ async def test_unconventual_shard_removal(ops_test: OpsTest):
         f"{CONFIG_SERVER_APP_NAME}:{CONFIG_SERVER_REL_NAME}",
     )
 
+    await ops_test.model.remove_application(SHARD_TWO_APP_NAME, block_until_done=True)
+
     async with ops_test.fast_forward():
         await ops_test.model.wait_for_idle(
-            apps=[CONFIG_SERVER_APP_NAME, SHARD_ONE_APP_NAME, SHARD_TWO_APP_NAME],
+            apps=[CONFIG_SERVER_APP_NAME, SHARD_ONE_APP_NAME],
             idle_period=20,
             status="active",
             timeout=TIMEOUT,
             raise_on_error=False,
         )
 
-    ops_test.model.remove_application(SHARD_TWO_APP_NAME, block_until_done=True)
-
     mongos_client = await generate_mongodb_client(
         ops_test, app_name=CONFIG_SERVER_APP_NAME, mongos=True
     )