diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-11 13:14:17 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-11 13:14:17 +0000 |
| commit | 95daf62bef31f28525cd044716d4b336decdd97a (patch) | |
| tree | 676f3ae650ce30824eb0b141905f0aa0e47d7957 | |
| parent | 1eff1bd385a28ccde7d0dc3a991c499ada1a63bd (diff) | |
| parent | 90569a175daf6c54474103df409f55882d222258 (diff) | |
| download | gitlab-ce-95daf62bef31f28525cd044716d4b336decdd97a.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
| -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 |