Skip to content

Commit

Permalink
fix(ci): Use mysql-k8s from 8.0/edge (#400)
Browse files Browse the repository at this point in the history
Deploy `mysql-k8s` charm from `8.0/edge` channel in all of our integration tests. 

Closes #377
  • Loading branch information
orfeas-k authored Jan 18, 2024
1 parent 39f2dd7 commit 3c51c1e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion charms/kfp-api/tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@ async def test_build_and_deploy(self, ops_test: OpsTest):
async def test_relational_db_relation_with_mysql_relation(self, ops_test: OpsTest):
"""Test failure of addition of relational-db relation with mysql relation present."""
# deploy mysql-k8s charm
# We should use `8.0/stable` once changes for
# https://github.com/canonical/mysql-k8s-operator/issues/337 are published there.
await ops_test.model.deploy(
"mysql-k8s",
channel="8.0/stable",
channel="8.0/edge",
config={"profile": "testing"},
trust=True,
)
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/bundles/kfp_1.7_stable_install.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ applications:
default-gateway: kubeflow-gateway
trust: true
kfp-db:
charm: mysql-k8s
channel: 8.0/stable
charm: mysql-k8s # We should use `8.0/stable` once changes for https://github.com/canonical/mysql-k8s-operator/issues/337 are published there.
channel: 8.0/edge
scale: 1
options:
profile: testing
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/bundles/kfp_latest_edge.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ applications:
argo-controller: { charm: ch:argo-controller, channel: latest/edge, scale: 1, trust: true }
metacontroller-operator: { charm: ch:metacontroller-operator, channel: latest/edge, scale: 1, trust: true }
minio: { charm: ch:minio, channel: latest/edge, scale: 1 }
kfp-db: { charm: ch:mysql-k8s, channel: 8.0/stable, scale: 1, constraints: mem=2G, trust: true }
# We should use `8.0/stable` once changes for https://github.com/canonical/mysql-k8s-operator/issues/337 are published there.
kfp-db: { charm: ch:mysql-k8s, channel: 8.0/edge, scale: 1, constraints: mem=2G, trust: true }
mlmd: { charm: ch:mlmd, channel: latest/edge, scale: 1 }
envoy: { charm: ch:envoy, channel: latest/edge, scale: 1 }
kubeflow-profiles: { charm: ch:kubeflow-profiles, channel: latest/edge, scale: 1, trust: true }
Expand Down

0 comments on commit 3c51c1e

Please sign in to comment.