diff --git a/tests/integration/new_relations/test_new_relations_2.py b/tests/integration/new_relations/test_new_relations_2.py index bb0a93b7f0..4df41decaf 100644 --- a/tests/integration/new_relations/test_new_relations_2.py +++ b/tests/integration/new_relations/test_new_relations_2.py @@ -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"), diff --git a/tests/integration/test_backups_gcp.py b/tests/integration/test_backups_gcp.py index df560c4448..0330c9f58d 100644 --- a/tests/integration/test_backups_gcp.py +++ b/tests/integration/test_backups_gcp.py @@ -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 diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index 60b5c10b34..0321e0f1eb 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -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(): @@ -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(