Merge pull request #109 from canonical/DPE-5344/OSD_v215

[DPE-5344] OSD v215

.github/workflows/ci.yaml

@@ -84,7 +84,7 @@ jobs:
     with:
       artifact-prefix: packed-charm-cache-true
       cloud: lxd
-      juju-agent-version: 3.4.3
+      juju-agent-version: 3.5.3
       _beta_allure_report: true
     secrets:
       # GitHub appears to redact each line of a multi-line secret

pyproject.toml

@@ -40,7 +40,7 @@ poetry-plugin-export = "^1.8.0"
 # TODO: clean any of the notes below and their deps.
 [tool.poetry.group.charm-libs.dependencies]
 # data_platform_libs/v0/data_interfaces.py
-ops = "^2.13.0"
+ops = "^2.15.0"
 poetry-core = "^1.9.0"
 # tls_certificates_interface/v3/tls_certificates.py
 cryptography = "^42.0.8"
@@ -95,7 +95,8 @@ responses = "^0.25.3"
 
 [tool.poetry.group.integration.dependencies]
 pytest = "^8.2.2"
-juju = "^3.2.0"
+# should not be updated unless https://github.com/juju/python-libjuju/issues/1093 is fixed
+juju = "~3.5.0"
 tenacity = "^8.4.2"
 coverage = {extras = ["toml"], version = ">7.0"}
 pytest-operator = ">0.20"

src/literals.py

@@ -4,7 +4,7 @@
 
 """Collection of global literals for the charm."""
 
-OPENSEARCH_DASHBOARDS_SNAP_REVISION = "19"
+OPENSEARCH_DASHBOARDS_SNAP_REVISION = "22"
 
 SUBSTRATE = "vm"
 CHARM_KEY = "opensearch-dashboards"
@@ -20,10 +20,10 @@
 
 DEPENDENCIES = {
     "osd_upstream": {
-        "dependencies": {"opensearch": "2.14"},
+        "dependencies": {"opensearch": "2.15"},
         "name": "opensearch-dashboards",
         "upgrade_supported": ">=2",
-        "version": "2.14",
+        "version": "2.15",
     },
 }
 

tests/integration/ha/test_network_cut.py

@@ -62,7 +62,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
     await ops_test.model.set_config(OPENSEARCH_CONFIG)
     # NOTE: can't access 2/stable from the tests, only 'edge' available
     await ops_test.model.deploy(
-        OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=143
+        OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=144
     )
 
     config = {"ca-common-name": "CN_CA"}

tests/integration/ha/test_scaling.py

@@ -47,7 +47,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
     # Opensearch
     await ops_test.model.set_config(OPENSEARCH_CONFIG)
     # NOTE: can't access 2/stable from the tests, only 'edge' available
-    await ops_test.model.deploy(OPENSEARCH_APP_NAME, channel="2/edge", num_units=2, revision=143)
+    await ops_test.model.deploy(OPENSEARCH_APP_NAME, channel="2/edge", num_units=2, revision=144)
 
     config = {"ca-common-name": "CN_CA"}
     await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, channel="stable", config=config)

tests/integration/test_charm.py

@@ -71,7 +71,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
     await asyncio.gather(
         ops_test.model.deploy(COS_AGENT_APP_NAME, num_units=1),
         ops_test.model.deploy(
-            OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=143
+            OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=144
         ),
         ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, channel="stable", config=config),
         ops_test.model.deploy(application_charm_build, application_name=DB_CLIENT_APP_NAME),

tests/integration/test_upgrade.py

@@ -48,7 +48,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
     await ops_test.model.deploy(pytest.charm, application_name=APP_NAME, num_units=NUM_UNITS_APP)
     await ops_test.model.set_config(OPENSEARCH_CONFIG)
     await ops_test.model.deploy(
-        OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=143
+        OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=144
     )
 
     config = {"ca-common-name": "CN_CA"}