Merge pull request #234 from canonical/nohaihab-fix-ci-issues

fix: merge dev branch to fix CI issues
canonical · Mar 15, 2024 · 2f0f334 · 2f0f334
2 parents a5e5cb4 + 17910f9
commit 2f0f334
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -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'

diff --git a/releases/2.1/beta/mlflow/bundle.yaml b/releases/2.1/beta/mlflow/bundle.yaml
@@ -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

diff --git a/releases/2.1/edge/mlflow/bundle.yaml b/releases/2.1/edge/mlflow/bundle.yaml
@@ -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

diff --git a/releases/2.1/stable/mlflow/bundle.yaml b/releases/2.1/stable/mlflow/bundle.yaml
@@ -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

diff --git a/releases/latest/beta/mlflow/bundle.yaml b/releases/latest/beta/mlflow/bundle.yaml
@@ -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

diff --git a/releases/latest/edge/mlflow/bundle.yaml b/releases/latest/edge/mlflow/bundle.yaml
@@ -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

diff --git a/releases/latest/stable/mlflow/bundle.yaml b/releases/latest/stable/mlflow/bundle.yaml
@@ -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

diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -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,
         )
@@ -297,7 +299,7 @@ async def test_can_create_experiment_with_mlflow_library(self, ops_test: OpsTest
     async def test_deploy_resource_dispatcher(self, ops_test: OpsTest):
         await ops_test.model.deploy(
             entity_url=METACONTROLLER_CHARM_NAME,
-            channel="latest/edge",
+            channel="3.0/stable",
             trust=True,
         )
         await ops_test.model.wait_for_idle(
@@ -308,7 +310,7 @@ async def test_deploy_resource_dispatcher(self, ops_test: OpsTest):
             timeout=120,
         )
         await ops_test.model.deploy(
-            RESOURCE_DISPATCHER_CHARM_NAME, channel="latest/edge", trust=True
+            RESOURCE_DISPATCHER_CHARM_NAME, channel="1.0/stable", trust=True
         )
         await ops_test.model.wait_for_idle(
             apps=[CHARM_NAME],