From b2f2bfb0cbdf90ebd96c8ab8557188e2cf8e8f8e Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Mon, 2 Jul 2018 10:24:56 +0200
Subject: [PATCH] test: make schema integration tests more resilient

Some times curl fails when trying to download a schema from GitHub. This
is usually just a temporary error and will succeed if retried.

This commit retries downloads up to 5 times before failing permanently.
---
 tests/scripts/download_json_schema.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/scripts/download_json_schema.sh b/tests/scripts/download_json_schema.sh
index 07093eec8..da055023a 100644
--- a/tests/scripts/download_json_schema.sh
+++ b/tests/scripts/download_json_schema.sh
@@ -2,6 +2,22 @@
 
 set -x
 
+download_schema()
+{
+    from=$1
+    to=$2
+
+    for run in {1..5}
+    do
+        curl -sf --compressed ${from} > ${to}
+        result=$?
+        if [ $result -eq 0 ]; then break; fi
+        sleep 1
+    done
+
+    if [ $result -ne 0 ]; then exit $result; fi
+}
+
 # parent directory
 basedir=$(dirname "$0")/..
 
@@ -25,7 +41,6 @@ FILES=( \
 mkdir -p ${basedir}/.schemacache/errors ${basedir}/.schemacache/transactions ${basedir}/.schemacache/sourcemaps
 
 for i in "${FILES[@]}"; do
-    output="${basedir}/.schemacache/${i}"
-    curl -sf https://raw.githubusercontent.com/elastic/apm-server/master/docs/spec/${i} --compressed > ${output} || exit $?
+    download_schema https://raw.githubusercontent.com/elastic/apm-server/master/docs/spec/${i} ${basedir}/.schemacache/${i}
 done
 echo "Done."