From 09e2742b05ade91e2f16cbc625788f0caa4f78b3 Mon Sep 17 00:00:00 2001 From: Marcelo Henrique Neppel Date: Tue, 25 Aug 2026 10:32:54 -0300 Subject: [PATCH 1/2] test(subordinates): bisect with landscape-client only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The subordinates integration test fails on every leg of PR #1904's CI runs. Drop the ubuntu-advantage subordinate from the test so CI runs the suite with only landscape-client attached; comparing this branch against the ubuntu-advantage-only sibling identifies which subordinate causes the failure. Throwaway bisect branch — not for merging. Signed-off-by: Marcelo Henrique Neppel --- tests/integration/test_subordinates.py | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/tests/integration/test_subordinates.py b/tests/integration/test_subordinates.py index ab3391a176c..724c0885d79 100644 --- a/tests/integration/test_subordinates.py +++ b/tests/integration/test_subordinates.py @@ -16,7 +16,6 @@ DATABASE_APP_NAME = "pg" LS_CLIENT = "landscape-client" -UBUNTU_PRO_APP_NAME = "ubuntu-advantage" logger = logging.getLogger(__name__) @@ -24,8 +23,7 @@ @pytest.fixture(scope="module") async def check_subordinate_env_vars(ops_test: OpsTest) -> None: if ( - not os.environ.get("UBUNTU_PRO_TOKEN", "").strip() - or not os.environ.get("LANDSCAPE_ACCOUNT_NAME", "").strip() + not os.environ.get("LANDSCAPE_ACCOUNT_NAME", "").strip() or not os.environ.get("LANDSCAPE_REGISTRATION_KEY", "").strip() ): pytest.skip("Subordinate configs not set") @@ -40,16 +38,6 @@ async def test_deploy(ops_test: OpsTest, charm: str, check_subordinate_env_vars) num_units=3, base=CHARM_BASE, ), - ops_test.model.deploy( - UBUNTU_PRO_APP_NAME, - config={"token": os.environ["UBUNTU_PRO_TOKEN"]}, - channel="latest/edge", - num_units=0, - base=CHARM_BASE, - # TODO switch back to series when pylib juju can figure out the base: - # https://github.com/juju/python-libjuju/issues/1240 - series="jammy", - ), ops_test.model.deploy( LS_CLIENT, config={ @@ -65,11 +53,8 @@ async def test_deploy(ops_test: OpsTest, charm: str, check_subordinate_env_vars) await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", timeout=2000) await ops_test.model.relate(f"{DATABASE_APP_NAME}:juju-info", f"{LS_CLIENT}:container") - await ops_test.model.relate( - f"{DATABASE_APP_NAME}:juju-info", f"{UBUNTU_PRO_APP_NAME}:juju-info" - ) await ops_test.model.wait_for_idle( - apps=[LS_CLIENT, UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active" + apps=[LS_CLIENT, DATABASE_APP_NAME], status="active" ) @@ -77,7 +62,7 @@ async def test_scale_up(ops_test: OpsTest, check_subordinate_env_vars): await scale_application(ops_test, DATABASE_APP_NAME, 4) await ops_test.model.wait_for_idle( - apps=[LS_CLIENT, UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active", timeout=1500 + apps=[LS_CLIENT, DATABASE_APP_NAME], status="active", timeout=1500 ) @@ -85,5 +70,5 @@ async def test_scale_down(ops_test: OpsTest, check_subordinate_env_vars): await scale_application(ops_test, DATABASE_APP_NAME, 3) await ops_test.model.wait_for_idle( - apps=[LS_CLIENT, UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active", timeout=1500 + apps=[LS_CLIENT, DATABASE_APP_NAME], status="active", timeout=1500 ) From 471d6d0249829a0b4240628ff93ddbb7bfc4f265 Mon Sep 17 00:00:00 2001 From: Marcelo Henrique Neppel Date: Tue, 25 Aug 2026 13:22:01 -0300 Subject: [PATCH 2/2] test(subordinates): collapse wait_for_idle to one line for ruff The follow-up to the previous commit: with ubuntu-advantage dropped, the call fits within the 99-char line limit, so ruff format --check fails CI on the multi-line form. Collapse it to unblock the lint job and let the integration suite run. Signed-off-by: Marcelo Henrique Neppel --- tests/integration/test_subordinates.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/integration/test_subordinates.py b/tests/integration/test_subordinates.py index 724c0885d79..67a07802310 100644 --- a/tests/integration/test_subordinates.py +++ b/tests/integration/test_subordinates.py @@ -53,9 +53,7 @@ async def test_deploy(ops_test: OpsTest, charm: str, check_subordinate_env_vars) await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", timeout=2000) await ops_test.model.relate(f"{DATABASE_APP_NAME}:juju-info", f"{LS_CLIENT}:container") - await ops_test.model.wait_for_idle( - apps=[LS_CLIENT, DATABASE_APP_NAME], status="active" - ) + await ops_test.model.wait_for_idle(apps=[LS_CLIENT, DATABASE_APP_NAME], status="active") async def test_scale_up(ops_test: OpsTest, check_subordinate_env_vars):