From 96b44b2b99e42ac71d9bea1c38bbd2e0b96da3d3 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Tue, 31 Oct 2017 16:39:41 +0100 Subject: [PATCH] Prefix env variables --- scripts/e2e-ci.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/e2e-ci.sh b/scripts/e2e-ci.sh index 66554cf74..6d8514797 100755 --- a/scripts/e2e-ci.sh +++ b/scripts/e2e-ci.sh @@ -4,10 +4,10 @@ CIRCLE_TEST_REPORTS=${CIRCLE_TEST_REPORTS:-./test/e2e/reports} CIRCLE_BRANCH=${CIRCLE_BRANCH:-master} # Amount of retries before failure. -MAX_RETRIES=${MAX_RETRIES:-1} +E2E_MAX_RETRIES=${E2E_MAX_RETRIES:-1} # Amount of seconds between tests. -SLEEP_BETWEEN_TESTS=${SLEEP_BETWEEN_TESTS:-1} +E2E_SLEEP_BETWEEN_TESTS=${E2E_SLEEP_BETWEEN_TESTS:-1} # Safari >= 8 has issues connecting to browserstack-local. Safari < 8 is too old. BROWSERS="chrome firefox ie edge" #safari @@ -36,12 +36,12 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then if [ "$result" -gt "0" ]; then echo "-- Failed e2e for $1 #$try --" - # Try again of MAX_RETRIES is not reached. - if [ "$try" -lt "$MAX_RETRIES" ]; then + # Try again of E2E_MAX_RETRIES is not reached. + if [ "$try" -lt "$E2E_MAX_RETRIES" ]; then let try=try+1 # Sleep a bit to let browserstack-local to close properly. - sleep "$SLEEP_BETWEEN_TESTS" + sleep "$E2E_SLEEP_BETWEEN_TESTS" browserstack "$1" "$try" return @@ -61,7 +61,7 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then fi # Sleep a bit to let browserstack-local to close properly. - sleep "$SLEEP_BETWEEN_TESTS" + sleep "$E2E_SLEEP_BETWEEN_TESTS" } # Test using browserstack.