Skip to content

Commit

Permalink
Merge pull request #228 from canonical/nohaihab-fix-ci
Browse files Browse the repository at this point in the history
* ci: Decrease root-reserve-mb to fit the new runner storage (#223)
to fix canonical/bundle-kubeflow#813
* fix: use mysql-k8s `8.0/edge` in the integration tests and bundles (#225)
* fix: use mysql-k8s edge
* fix: add comment to revert to stable
  • Loading branch information
NohaIhab authored Mar 6, 2024
2 parents 742c8d0 + 270dff3 commit fbbbfee
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Maximise GH runner space
uses: easimon/maximize-build-space@v8
with:
root-reserve-mb: 40960
root-reserve-mb: 29696
remove-dotnet: 'true'
remove-haskell: 'true'
remove-android: 'true'
Expand Down
4 changes: 3 additions & 1 deletion releases/2.1/beta/mlflow/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ applications:
_github_repo_name: minio-operator
mlflow-mysql:
charm: mysql-k8s
channel: 8.0/stable
# 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
trust: true
_github_repo_name: mysql-k8s-operator
Expand Down
4 changes: 3 additions & 1 deletion releases/2.1/edge/mlflow/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ applications:
_github_repo_name: minio-operator
mlflow-mysql:
charm: mysql-k8s
channel: 8.0/stable
# 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
trust: true
_github_repo_name: mysql-k8s-operator
Expand Down
4 changes: 3 additions & 1 deletion releases/2.1/stable/mlflow/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ applications:
_github_repo_name: minio-operator
mlflow-mysql:
charm: mysql-k8s
channel: 8.0/stable
# 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
trust: true
_github_repo_name: mysql-k8s-operator
Expand Down
4 changes: 3 additions & 1 deletion releases/latest/beta/mlflow/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ applications:
_github_repo_name: minio-operator
mlflow-mysql:
charm: mysql-k8s
channel: 8.0/stable
# 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
trust: true
_github_repo_name: mysql-k8s-operator
Expand Down
4 changes: 3 additions & 1 deletion releases/latest/edge/mlflow/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ applications:
_github_repo_name: minio-operator
mlflow-mysql:
charm: mysql-k8s
channel: 8.0/stable
# 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
trust: true
_github_repo_name: mysql-k8s-operator
Expand Down
4 changes: 3 additions & 1 deletion releases/latest/stable/mlflow/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ applications:
_github_repo_name: minio-operator
mlflow-mysql:
charm: mysql-k8s
channel: 8.0/stable
# 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
trust: true
_github_repo_name: mysql-k8s-operator
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ async def test_add_relational_db_with_relation_expect_active(self, ops_test: Ops
)
await ops_test.model.deploy(
RELATIONAL_DB_CHARM_NAME,
channel="8.0/stable",
# 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",
series="jammy",
trust=True,
)
Expand Down

0 comments on commit fbbbfee

Please sign in to comment.