Skip to content

[MISC] Disable landscape subordinate test lxd #831

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

Merged
merged 2 commits into from
Apr 15, 2025
Merged

[MISC] Disable landscape subordinate test lxd #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df146a
Set series for ubuntu-advantage test and disable the landscape test
dragomirp Apr 11, 2025
a696966
Revert to LTS LXD
dragomirp Apr 14, 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
1 change: 0 additions & 1 deletion concierge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ providers:
lxd:
enable: true
bootstrap: true
channel: latest/stable
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arm self healing seems more unstable on 6.3.

host:
snaps:
jhack:
Expand Down
10 changes: 6 additions & 4 deletions tests/integration/test_subordinates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ async def test_deploy(ops_test: OpsTest, charm: str, check_subordinate_env_vars)
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",
Comment on lines +49 to +51
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We must set the correct base.

),
ops_test.model.deploy(
LS_CLIENT,
Expand All @@ -61,26 +64,25 @@ 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")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the relation until we figure out what is going on with the CI subscription.

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=[UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active"
)


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=[UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active", timeout=1500
)


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=[UBUNTU_PRO_APP_NAME, DATABASE_APP_NAME], status="active", timeout=1500
)
Loading