Skip to content

Commit ede8bf6

Browse files
committed
Tests using Opensearch 2/edge again
1 parent fb6367e commit ede8bf6

4 files changed

Lines changed: 4 additions & 10 deletions

File tree

tests/integration/ha/test_network_cut.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
6161
# Opensearch
6262
await ops_test.model.set_config(OPENSEARCH_CONFIG)
6363
# NOTE: can't access 2/stable from the tests, only 'edge' available
64-
await ops_test.model.deploy(
65-
OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=144
66-
)
64+
await ops_test.model.deploy(OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB)
6765

6866
config = {"ca-common-name": "CN_CA"}
6967
await ops_test.model.deploy(TLS_CERT_APP_NAME, channel="stable", config=config)

tests/integration/ha/test_scaling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
4747
# Opensearch
4848
await ops_test.model.set_config(OPENSEARCH_CONFIG)
4949
# NOTE: can't access 2/stable from the tests, only 'edge' available
50-
await ops_test.model.deploy(OPENSEARCH_APP_NAME, channel="2/edge", num_units=2, revision=144)
50+
await ops_test.model.deploy(OPENSEARCH_APP_NAME, channel="2/edge", num_units=2)
5151

5252
config = {"ca-common-name": "CN_CA"}
5353
await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, channel="stable", config=config)

tests/integration/test_charm.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
7070
config = {"ca-common-name": "CN_CA"}
7171
await asyncio.gather(
7272
ops_test.model.deploy(COS_AGENT_APP_NAME, num_units=1),
73-
ops_test.model.deploy(
74-
OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=144
75-
),
73+
ops_test.model.deploy(OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB),
7674
ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, channel="stable", config=config),
7775
ops_test.model.deploy(application_charm_build, application_name=DB_CLIENT_APP_NAME),
7876
)

tests/integration/test_upgrade.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
4747
pytest.charm = await ops_test.build_charm(".")
4848
await ops_test.model.deploy(pytest.charm, application_name=APP_NAME, num_units=NUM_UNITS_APP)
4949
await ops_test.model.set_config(OPENSEARCH_CONFIG)
50-
await ops_test.model.deploy(
51-
OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB, revision=144
52-
)
50+
await ops_test.model.deploy(OPENSEARCH_APP_NAME, channel="2/edge", num_units=NUM_UNITS_DB)
5351

5452
config = {"ca-common-name": "CN_CA"}
5553
await ops_test.model.deploy(TLS_CERTIFICATES_APP_NAME, channel="stable", config=config)

0 commit comments

Comments
 (0)