Fix retries in grab_console_log.sh

We implemented retries of console log grabbing to workaround occasional
jenkins 502 errors, but this is running under set -e so curl returning a
non zero error message resulted in short circuiting the retries and
failed the jobs.

Fix this with a simple || true appendage to the curl command so that any
failed curls can error properly without affecting the error checking in
the script. We will then retry until we eventually give up.

Change-Id: I0a784aa45bff7de5b411372ccecc569ec148ecc5
This commit is contained in:
Clark Boylan 2015-04-15 16:51:14 -07:00
parent ab6ef5a6af
commit 3d5a035197

View File

@ -28,7 +28,7 @@ while ! grep -q "$END_UUID" /tmp/console.html; do
# fails. This allows us to retry when we have Jenkins proxy
# errors without polluting the output document.
# --insecure because our Jenkins masters use self signed SSL certs.
curl -X POST --data "start=$(stat -c %s /tmp/console.html || echo 0)" --fail --insecure $BUILD_URL$console_log_path >> /tmp/console.html
curl -X POST --data "start=$(stat -c %s /tmp/console.html || echo 0)" --fail --insecure $BUILD_URL$console_log_path >> /tmp/console.html || true
done
# We need to add <pre> tags around the output for log-osanalyze to not escape