diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-11 13:14:17 +0000 |
---|---|---|
committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 13:51:42 +0000 |
commit | d3a882b4ddd3cd1cdc9acea5a2695d003930d091 (patch) | |
tree | 368e5354d00a1e595eface21e6c537864f7563ec /scripts | |
parent | 402e4c9b1bbc13b84866f1e03844c56aa38c45ad (diff) | |
download | gitlab-ce-d3a882b4ddd3cd1cdc9acea5a2695d003930d091.tar.gz |
Merge branch 'qa/gb/improve-multi-project-pipeline-omnibus-script' into 'master'
Do not raise when downstream pipeline is created
Closes #40987
See merge request gitlab-org/gitlab-ce!15837
(cherry picked from commit 95daf62bef31f28525cd044716d4b336decdd97a)
90569a17 Do not raise when downstream pipeline is created
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/trigger-build-omnibus | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/trigger-build-omnibus b/scripts/trigger-build-omnibus index 3c5c22c9372..4ff0e8e10b7 100755 --- a/scripts/trigger-build-omnibus +++ b/scripts/trigger-build-omnibus @@ -66,7 +66,7 @@ module Omnibus raise 'Pipeline timeout!' if timeout? case status - when :pending, :running + when :created, :pending, :running puts "Waiting another #{INTERVAL} seconds ..." sleep INTERVAL when :success |