Merge pull request #123 from MusicDin/fix/image-centos

Fix CentOS timeout on boot during test
canonical · Apr 2, 2024 · 1251deb · 1251deb
2 parents 655c09d + 3bc801f
commit 1251deb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/bin/helpers b/bin/helpers
@@ -13,7 +13,7 @@ waitSnapdSeed() (
 # waitInstanceReady: waits for the instance to be ready (processes count > 1).
 waitInstanceReady() (
   set +x
-  maxWait=120
+  maxWait="${MAX_WAIT_SECONDS:-120}"
   instName="${1}"
   instProj="${2:-}"
   if [ -z "${instProj}" ]; then

diff --git a/bin/test-image b/bin/test-image
@@ -152,9 +152,15 @@ done
 echo "==> Waiting for instances to start"
 for i in ${INSTANCES}; do
     if [ "${DIST}" == "busybox" ]; then
+        # Busybox has only 1 process running when ready.
         MIN_PROC_COUNT=1
     fi
 
+    if [ "${DIST}" == "centos" ]; then
+        # Give CentOS a bit more time to boot.
+        MAX_WAIT_SECONDS=180
+    fi
+
     waitInstanceReady "${i}"
 done