Skip to content

Workaround juju 21047 #1154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 16/edge
Choose a base branch
from
Open

Workaround juju 21047 #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af764ff
Mark tests as unstable
marceloneppel Oct 30, 2025
a3c6fde
Change application name
marceloneppel Oct 30, 2025
96acf26
Fix redis-k8s channel
marceloneppel Oct 30, 2025
afbdd6f
Fix redis-k8s base
marceloneppel Oct 30, 2025
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: 2 additions & 2 deletions tests/integration/new_relations/test_new_relations_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ async def test_indico_datatabase(ops_test: OpsTest) -> None:
series="focal",
)
await ops_test.model.deploy(
"redis-k8s", channel="stable", application_name="redis-broker", base="ubuntu@20.04"
"redis-k8s", channel="edge", application_name="redis-broker", base="ubuntu@22.04"
)
await ops_test.model.deploy(
"redis-k8s", channel="stable", application_name="redis-cache", base="ubuntu@20.04"
"redis-k8s", channel="edge", application_name="redis-cache", base="ubuntu@22.04"
)
await asyncio.gather(
ops_test.model.relate("redis-broker", "indico:redis-broker"),
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_backups_gcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ async def test_restore_on_new_cluster(
ops_test: OpsTest, charm, gcp_cloud_configs: tuple[dict, dict]
) -> None:
"""Test that is possible to restore a backup to another PostgreSQL cluster."""
previous_database_app_name = f"{DATABASE_APP_NAME}-gcp"
previous_database_app_name = f"old-{DATABASE_APP_NAME}-gcp"
database_app_name = f"new-{DATABASE_APP_NAME}"
await build_and_deploy(
ops_test, charm, 1, database_app_name=previous_database_app_name, wait_for_idle=False
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/test_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ async def test_application_removal(ops_test: OpsTest) -> None:
assert APP_NAME not in ops_test.model.applications


@pytest.mark.skip(reason="Unstable")
async def test_redeploy_charm_same_model(ops_test: OpsTest, charm):
"""Redeploy the charm in the same model to test that it works."""
async with ops_test.fast_forward():
Expand All @@ -425,6 +426,7 @@ async def test_redeploy_charm_same_model(ops_test: OpsTest, charm):
)


@pytest.mark.skip(reason="Unstable")
async def test_redeploy_charm_same_model_after_forcing_removal(ops_test: OpsTest, charm) -> None:
"""Redeploy the charm in the same model to test that it works after a forceful removal."""
return_code, _, stderr = await ops_test.juju(
Expand Down