Skip to content

test: remove data-integrator's temporary channel deployment #504

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
MattiaSarti merged 1 commit into from
Sep 29, 2026
Merged

test: remove data-integrator's temporary channel deployment #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 4 additions & 17 deletions tests/integration/test_charm_ambient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,25 +410,12 @@ async def test_mlflow_bucket_exists(self, ops_test):
@pytest.mark.abort_on_fail
async def test_deploy_data_integrator(self, ops_test: OpsTest):
"""Deploy a data-integrator instance, for user grants in subsequent tests."""
# TODO: remove this command and restore the command below once
# https://github.com/canonical/data-integrator/pull/328 lands on main, that is on channel
# "latest/edge", and mind that an explicit Juju-CLI deploy is temporarily required because
# python-libjuju's `Model.deploy()` breaks with this temporary channel format:
await ops_test.juju(
"deploy",
await ops_test.model.deploy(
DATA_INTEGRATOR.charm,
"--trust",
"--channel",
"latest/edge/mlflow-client",
"--revision",
"521",
channel=DATA_INTEGRATOR.channel,
config=DATA_INTEGRATOR.config,
trust=DATA_INTEGRATOR.trust,
)
# await ops_test.model.deploy(
# DATA_INTEGRATOR.charm,
# channel=DATA_INTEGRATOR.channel,
# config=DATA_INTEGRATOR.config,
# trust=DATA_INTEGRATOR.trust,
# )
await ops_test.model.wait_for_idle(
apps=[DATA_INTEGRATOR.charm], status="blocked", timeout=600, idle_period=60
)
Expand Down
21 changes: 4 additions & 17 deletions tests/integration/test_charm_object_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,25 +400,12 @@ async def test_mlflow_bucket_exists(self, ops_test):
@pytest.mark.abort_on_fail
async def test_deploy_data_integrator(self, ops_test: OpsTest):
"""Deploy a data-integrator instance, for user grants in subsequent tests."""
# TODO: remove this command and restore the command below once
# https://github.com/canonical/data-integrator/pull/328 lands on main, that is on channel
# "latest/edge", and mind that an explicit Juju-CLI deploy is temporarily required because
# python-libjuju's `Model.deploy()` breaks with this temporary channel format:
await ops_test.juju(
"deploy",
await ops_test.model.deploy(
DATA_INTEGRATOR.charm,
"--trust",
"--channel",
"latest/edge/mlflow-client",
"--revision",
"521",
channel=DATA_INTEGRATOR.channel,
config=DATA_INTEGRATOR.config,
trust=DATA_INTEGRATOR.trust,
)
# await ops_test.model.deploy(
# DATA_INTEGRATOR.charm,
# channel=DATA_INTEGRATOR.channel,
# config=DATA_INTEGRATOR.config,
# trust=DATA_INTEGRATOR.trust,
# )
await ops_test.model.wait_for_idle(
apps=[DATA_INTEGRATOR.charm], status="blocked", timeout=600, idle_period=60
)
Expand Down
21 changes: 4 additions & 17 deletions tests/integration/test_charm_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,25 +393,12 @@ async def test_can_connect_exporter_and_get_metrics(self, ops_test: OpsTest):
@pytest.mark.abort_on_fail
async def test_deploy_data_integrator(self, ops_test: OpsTest):
"""Deploy a data-integrator instance, for user grants in subsequent tests."""
# TODO: remove this command and restore the command below once
# https://github.com/canonical/data-integrator/pull/328 lands on main, that is on channel
# "latest/edge", and mind that an explicit Juju-CLI deploy is temporarily required because
# python-libjuju's `Model.deploy()` breaks with this temporary channel format:
await ops_test.juju(
"deploy",
await ops_test.model.deploy(
DATA_INTEGRATOR.charm,
"--trust",
"--channel",
"latest/edge/mlflow-client",
"--revision",
"521",
channel=DATA_INTEGRATOR.channel,
config=DATA_INTEGRATOR.config,
trust=DATA_INTEGRATOR.trust,
)
# await ops_test.model.deploy(
# DATA_INTEGRATOR.charm,
# channel=DATA_INTEGRATOR.channel,
# config=DATA_INTEGRATOR.config,
# trust=DATA_INTEGRATOR.trust,
# )
await ops_test.model.wait_for_idle(
apps=[DATA_INTEGRATOR.charm], status="blocked", timeout=600, idle_period=60
)
Expand Down
Loading