Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tests/integration/ha_tests/test_restart.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ async def test_deploy(ops_test: OpsTest, charm) -> None:
"""Build and deploy a PostgreSQL cluster and a test application."""
await build_and_deploy(ops_test, charm, CLUSTER_SIZE, wait_for_idle=False)
if not await app_name(ops_test, APPLICATION_NAME):
await ops_test.model.deploy(APPLICATION_NAME, num_units=1, channel="edge")
await ops_test.model.deploy(
APPLICATION_NAME, num_units=1, channel="latest/edge", series="noble"
)

await ops_test.model.relate(DATABASE_APP_NAME, f"{APPLICATION_NAME}:database")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None:
model_1.deploy(
charm=DB_TEST_APP_NAME,
app=DB_TEST_APP_1,
base="ubuntu@22.04",
base="ubuntu@24.04",
channel="latest/edge",
num_units=1,
constraints=constraints,
)
model_2.deploy(
charm=DB_TEST_APP_NAME,
app=DB_TEST_APP_2,
base="ubuntu@22.04",
base="ubuntu@24.04",
channel="latest/edge",
num_units=1,
constraints=constraints,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def test_deploy(first_model: str, second_model: str, charm: str) -> None:
model_1.deploy(
charm=DB_TEST_APP_NAME,
app=DB_TEST_APP_NAME,
base="ubuntu@22.04",
base="ubuntu@24.04",
channel="latest/edge",
constraints=constraints,
num_units=1,
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/high_availability/test_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_deploy_latest(juju: Juju) -> None:
juju.deploy(
charm=DB_TEST_APP_NAME,
app=DB_TEST_APP_NAME,
base="ubuntu@22.04",
base="ubuntu@24.04",
channel="latest/edge",
num_units=1,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def test_deploy_stable(juju: Juju) -> None:
juju.deploy(
charm=DB_TEST_APP_NAME,
app=DB_TEST_APP_NAME,
base="ubuntu@22.04",
base="ubuntu@24.04",
channel="latest/edge",
num_units=1,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_deploy_stable(juju: Juju) -> None:
juju.deploy(
charm=DB_TEST_APP_NAME,
app=DB_TEST_APP_NAME,
base="ubuntu@22.04",
base="ubuntu@24.04",
channel="latest/edge",
num_units=1,
)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_audit.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ async def test_audit_plugin(ops_test: OpsTest, charm) -> None:
"""Test the audit plugin."""
await asyncio.gather(
build_and_deploy(ops_test, charm, 1),
ops_test.model.deploy(APPLICATION_NAME, channel="edge"),
ops_test.model.deploy(APPLICATION_NAME, channel="latest/edge", series="noble"),
)
await ops_test.model.relate(f"{APPLICATION_NAME}:{RELATION_ENDPOINT}", DATABASE_APP_NAME)
async with ops_test.fast_forward():
Expand Down