[DPE-5496] Release 2.17 (#452)

Update opensearch to 2.17. Also fixes a race condition in upgrade tests.
canonical · Sep 20, 2024 · 81625dc · 81625dc
1 parent a93ac92
commit 81625dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/charms/opensearch/v0/constants_charm.py b/lib/charms/opensearch/v0/constants_charm.py
@@ -111,7 +111,7 @@
 KibanaserverRole = "kibana_server"
 
 # Opensearch Snap revision
-OPENSEARCH_SNAP_REVISION = 57  # Keep in sync with `workload_version` file
+OPENSEARCH_SNAP_REVISION = 58  # Keep in sync with `workload_version` file
 
 # User-face Backup ID format
 OPENSEARCH_BACKUP_ID_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
diff --git a/tests/integration/upgrades/test_small_deployment_upgrades.py b/tests/integration/upgrades/test_small_deployment_upgrades.py
@@ -29,12 +29,12 @@
 OPENSEARCH_CHANNEL = "2/edge"
 
 
-STARTING_VERSION = "2.14.0"
+STARTING_VERSION = "2.15.0"
 
 
 VERSION_TO_REVISION = {
-    STARTING_VERSION: 143,
-    "2.15.0": 144,
+    STARTING_VERSION: 144,
+    "2.16.0": 160,
 }
 
 
@@ -273,10 +273,12 @@ async def test_upgrade_rollback_from_local(
         )
 
         # Wait until we are set in an idle state and can rollback the revision.
+        # app status blocked: that will happen if we are jumping N-2 versions in our test
+        # app status active: that will happen if we are jumping N-1 in our test
         await wait_until(
             ops_test,
             apps=[app],
-            apps_statuses=["blocked"],
+            apps_statuses=["active", "blocked"],
             units_statuses=["active"],
             wait_for_exact_units={
                 APP_NAME: 3,

diff --git a/workload_version b/workload_version
@@ -1 +1 @@
-2.16.0
+2.17.0