From beeb1fcd1d4c3e97bf7e66a97f9641be413e0fbe Mon Sep 17 00:00:00 2001 From: Din Music Date: Tue, 2 Apr 2024 17:53:41 +0200 Subject: [PATCH 1/2] bin/helpers: Make max wait time in waitInstanceReady configurable Signed-off-by: Din Music --- bin/helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/helpers b/bin/helpers index 4458e1ed2..503fdd2c2 100644 --- 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 From 3bc801f2f5004ef33207a378fb319b0f73a43e80 Mon Sep 17 00:00:00 2001 From: Din Music Date: Tue, 2 Apr 2024 17:54:45 +0200 Subject: [PATCH 2/2] bin/test-image: Give Centos images an extra minute to boot Signed-off-by: Din Music --- bin/test-image | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/test-image b/bin/test-image index 47648405a..db4f22bf0 100755 --- 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