diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:03 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:04 +0900 |
| commit | dcad9a4c87daa4c90d5504e87973d2d5a5d31ff4 (patch) | |
| tree | 46d5532f45d42729f0a2985013f27b5f8eba6663 /ci | |
| parent | Merge branch 'ah/log-decorate-default-to-auto' (diff) | |
| parent | travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503 (diff) | |
| download | tgif-dcad9a4c87daa4c90d5504e87973d2d5a5d31ff4.tar.xz | |
Merge branch 'ls/travis-relays-for-windows-ci'
* ls/travis-relays-for-windows-ci:
travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503
travis-ci: handle Git for Windows CI status "failed" explicitly
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run-windows-build.sh | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh index d8f0d92f28..2d98f6b2f9 100755 --- a/ci/run-windows-build.sh +++ b/ci/run-windows-build.sh @@ -14,14 +14,33 @@ COMMIT=$2 gfwci () { local CURL_ERROR_CODE HTTP_CODE - exec 3>&1 + CONTENT_FILE=$(mktemp -t "git-windows-ci-XXXXXX") + while test -z $HTTP_CODE + do HTTP_CODE=$(curl \ -H "Authentication: Bearer $GFW_CI_TOKEN" \ --silent --retry 5 --write-out '%{HTTP_CODE}' \ - --output >(sed "$(printf '1s/^\xef\xbb\xbf//')" >cat >&3) \ + --output >(sed "$(printf '1s/^\xef\xbb\xbf//')" >$CONTENT_FILE) \ "https://git-for-windows-ci.azurewebsites.net/api/TestNow?$1" \ ) CURL_ERROR_CODE=$? + # The GfW CI web app sometimes returns HTTP errors of + # "502 bad gateway" or "503 service unavailable". + # We also need to check the HTTP content because the GfW web + # app seems to pass through (error) results from other Azure + # calls with HTTP code 200. + # Wait a little and retry if we detect this error. More info: + # https://docs.microsoft.com/en-in/azure/app-service-web/app-service-web-troubleshoot-http-502-http-503 + if test $HTTP_CODE -eq 502 || + test $HTTP_CODE -eq 503 || + grep "502 - Web server received an invalid response" $CONTENT_FILE >/dev/null + then + sleep 10 + HTTP_CODE= + fi + done + cat $CONTENT_FILE + rm $CONTENT_FILE if test $CURL_ERROR_CODE -ne 0 then return $CURL_ERROR_CODE @@ -61,7 +80,8 @@ do case "$STATUS" in inProgress|postponed|notStarted) sleep 10 ;; # continue "completed: succeeded") RESULT="success"; break;; # success - *) echo "Unhandled status: $STATUS"; break;; # failure + "completed: failed") break;; # failure + *) echo "Unhandled status: $STATUS"; break;; # unknown esac done |