[camel-website] 01/02: chore: additional check that website is up

[zr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch pr/redirect-test-robustness
in repository https://gitbox.apache.org/repos/asf/camel-website.git

commit 652db2f6daf6c4260f4b8a1812d105166d2f8a48
Author: Zoran Regvart <zo...@regvart.com>
AuthorDate: Wed Dec 15 11:55:28 2021 +0100

    chore: additional check that website is up
    
    When running the web server in a container for the redirect tests there
    could be some network issues reaching it. This adds detection of that
    situation and switches to using curl from inside of the web server
    container.
    
    This issue has occurred once on ASF Jenkins in build 622[1],
    unfortunately without details allowing us to troubleshot this issue.
    
    [1] https://ci-builds.apache.org/job/Camel/job/Camel.website/job/main/622/
---
 tests/redirect.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/redirect.sh b/tests/redirect.sh
index a05ebad..7ccb05f 100755
--- a/tests/redirect.sh
+++ b/tests/redirect.sh
@@ -84,6 +84,24 @@ if [ "$SERVE" == 1 ]; then
   fi
 fi
 
+# make sure we can reach the web site
+CURL_CMD=curl
+set +e
+$CURL_CMD -k --no-progress-meter -o /dev/null --retry-all-errors --retry-delay 3 --retry 5 "$BASE_URL" || {
+  set -e
+  if [ -n "${CONTAINER_ID+x}" ]; then
+    echo Reverting to using curl from within the HTTP container
+    $CONTAINER_CMD exec "$CONTAINER_ID" apt-get update -y
+    $CONTAINER_CMD exec "$CONTAINER_ID" apt-get install -y curl
+    CURL_CMD="$CONTAINER_CMD exec $CONTAINER_ID curl"
+    BASE_URL=https://localhost
+    $CURL_CMD -k --no-progress-meter -o /dev/null --retry-all-errors --retry-delay 3 --retry 5 "$BASE_URL"
+  else
+    exit 1
+  fi
+}
+set -e
+
 TOTAL=0
 SUCCESS=0
 
@@ -98,7 +116,7 @@ function test {
 
   local output
   set +e
-  output=$(curl -k -w '%{http_code},%{redirect_url}\n' -o /dev/null -s "${url}")
+  output=$($CURL_CMD -k -w '%{http_code},%{redirect_url}\n' -o /dev/null -s "${url}")
   set -e
   TOTAL=$((TOTAL + 1))