Merge branch 'improve-scripts-trigger-build' into 'master'

Ignore GitLab API hiccups in scripts/trigger-build

See merge request gitlab-org/gitlab-ce!20038

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