change microk8s version to 1.25

RafalSiwek · Dec 27, 2023 · 30cf19f · 30cf19f
1 parent 64093e2
commit 30cf19f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -69,8 +69,8 @@ jobs:
         with:
           juju-channel: "3.1/stable"
           provider: microk8s
-          channel: 1.28-strict/stable
-          microk8s-addons: "dns rbac storage metallb:10.64.140.43-10.64.140.49"
+          channel: 1.25-strict/stable
+          microk8s-addons: "dns storage rbac metallb:10.64.140.43-10.64.140.49"
 
       - name: Run integration tests
         run: sg snap_microk8s -c "tox -vve integration -- --model testing"

diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
@@ -1,6 +1,7 @@
 import logging
 import subprocess
 from pathlib import Path
+import time
 
 import pytest
 import yaml
@@ -22,15 +23,27 @@ async def test_successfull_deploy_senario(self, ops_test: OpsTest):
             channel="8.0/stable",
             trust=True,
         )
+
+        await ops_test.model.wait_for_idle(
+            apps=[RELATIONAL_DB_CHARM_NAME],
+            status="active",
+            raise_on_blocked=False,
+            raise_on_error=False,
+            timeout=600,
+        )
+
         await ops_test.model.relate(RELATIONAL_DB_CHARM_NAME, CHARM_NAME)
 
+        time.wait(10) # Wait for relation to get active setup
+
         await ops_test.model.wait_for_idle(
-            apps=[CHARM_NAME, RELATIONAL_DB_CHARM_NAME],
+            apps=[RELATIONAL_DB_CHARM_NAME, CHARM_NAME],
             status="active",
             raise_on_blocked=False,
             raise_on_error=False,
             timeout=600,
         )
+
         assert ops_test.model.applications[CHARM_NAME].units[0].workload_status == "active"
 
         config = await ops_test.model.applications[CHARM_NAME].get_config()