summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-06-20 17:17:29 +0200
committerRémy Coutable <remy@rymai.me>2018-06-20 17:17:29 +0200
commit67f310e41fe739d28e5620b816e8568433e977ce (patch)
treee18925228466ca92dbb042313bf4fac9cc79570f /scripts
parent222284a6bf9348b30b5ce2b1b04370163e2120e5 (diff)
downloadgitlab-ce-67f310e41fe739d28e5620b816e8568433e977ce.tar.gz
Ignore GitLab API hiccups in scripts/trigger-buildimprove-scripts-trigger-build
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/trigger-build4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build
index 526f5164ede..798bf1e82b7 100755
--- a/scripts/trigger-build
+++ b/scripts/trigger-build
@@ -165,6 +165,10 @@ module Trigger
end
JSON.parse(res.body)['status'].to_s.to_sym
+ rescue JSON::ParserError
+ # Ignore GitLab API hiccups. If GitLab is really down, we'll hit the job
+ # timeout anyway.
+ :running
end
end
end