[DPE-3972] Update to 2.13.0 (#307)

Also rollback upgrade testing that originally pointed to dummy charm. Now, they install the charm directly from `2/edge`.
canonical · May 24, 2024 · 2fbfa4b · 2fbfa4b
1 parent 2af1298
commit 2fbfa4b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lib/charms/opensearch/v0/constants_charm.py b/lib/charms/opensearch/v0/constants_charm.py
@@ -108,7 +108,7 @@
 KibanaserverRole = "kibana_server"
 
 # Opensearch Snap revision
-OPENSEARCH_SNAP_REVISION = 44  # Keep in sync with `workload_version` file
+OPENSEARCH_SNAP_REVISION = 50  # 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/test_manual_large_deployment_upgrades.py b/tests/integration/test_manual_large_deployment_upgrades.py
@@ -18,8 +18,8 @@
 logger = logging.getLogger(__name__)
 
 
-OPENSEARCH_ORIGINAL_CHARM_NAME = "pguimaraes-opensearch-upgrade-test"
-OPENSEARCH_INITIAL_CHANNEL = "latest/edge"
+OPENSEARCH_ORIGINAL_CHARM_NAME = "opensearch"
+OPENSEARCH_INITIAL_CHANNEL = "2/edge"
 OPENSEARCH_MAIN_APP_NAME = "main"
 OPENSEARCH_FAILOVER_APP_NAME = "failover"
 

diff --git a/tests/integration/test_small_deployment_upgrades.py b/tests/integration/test_small_deployment_upgrades.py
@@ -18,8 +18,8 @@
 logger = logging.getLogger(__name__)
 
 
-OPENSEARCH_ORIGINAL_CHARM_NAME = "pguimaraes-opensearch-upgrade-test"
-OPENSEARCH_INITIAL_CHANNEL = "latest/edge"
+OPENSEARCH_ORIGINAL_CHARM_NAME = "opensearch"
+OPENSEARCH_INITIAL_CHANNEL = "2/edge"
 MACHINE_ID = 0
 
 
@@ -122,7 +122,7 @@ async def test_upgrade_rollback(
         # )
         subprocess.check_output(
             f"juju refresh {app} --switch {OPENSEARCH_ORIGINAL_CHARM_NAME} "
-            "--channel latest/edge".split(),
+            f"--channel {OPENSEARCH_INITIAL_CHANNEL}".split(),
         )
 
         await wait_until(

diff --git a/workload_version b/workload_version
@@ -1 +1 @@
-2.12.0
+2.13.0