Skip to content

Commit 0f9ab15

Browse files
authored
[MISC] Disable landscape subordinate test lxd (#831)
* Set series for ubuntu-advantage test and disable the landscape test * Revert to LTS LXD
1 parent 03598a4 commit 0f9ab15

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

concierge.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ providers:
55
lxd:
66
enable: true
77
bootstrap: true
8-
channel: latest/stable
98
host:
109
snaps:
1110
jhack:

tests/integration/test_subordinates.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ async def test_deploy(ops_test: OpsTest, charm: str, check_subordinate_env_vars)
4646
channel="latest/edge",
4747
num_units=0,
4848
base=CHARM_BASE,
49+
# TODO switch back to series when pylib juju can figure out the base:
50+
# https://github.com/juju/python-libjuju/issues/1240
51+
series="jammy",
4952
),
5053
ops_test.model.deploy(
5154
LS_CLIENT,
@@ -61,26 +64,25 @@ async def test_deploy(ops_test: OpsTest, charm: str, check_subordinate_env_vars)
6164
)
6265

6366
await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", timeout=2000)
64-
await ops_test.model.relate(f"{DATABASE_APP_NAME}:juju-info", f"{LS_CLIENT}:container")
6567
await ops_test.model.relate(
6668
f"{DATABASE_APP_NAME}:juju-info", f"{UBUNTU_PRO_APP_NAME}:juju-info"
6769
)
6870
await ops_test.model.wait_for_idle(
69-
apps=[LS_CLIENT, UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active"
71+
apps=[UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active"
7072
)
7173

7274

7375
async def test_scale_up(ops_test: OpsTest, check_subordinate_env_vars):
7476
await scale_application(ops_test, DATABASE_APP_NAME, 4)
7577

7678
await ops_test.model.wait_for_idle(
77-
apps=[LS_CLIENT, UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active", timeout=1500
79+
apps=[UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active", timeout=1500
7880
)
7981

8082

8183
async def test_scale_down(ops_test: OpsTest, check_subordinate_env_vars):
8284
await scale_application(ops_test, DATABASE_APP_NAME, 3)
8385

8486
await ops_test.model.wait_for_idle(
85-
apps=[LS_CLIENT, UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active", timeout=1500
87+
apps=[UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active", timeout=1500
8688
)

0 commit comments

Comments
 (0)