diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-09 15:16:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-09 15:16:09 +0000 |
| commit | 320590180703c620cedd6eb6023548dca2d026cf (patch) | |
| tree | db12cca454e5def496a351b2ee4a156c0e043a09 | |
| parent | a783108eff35c0ba866bde64a6b00eb2969e5b96 (diff) | |
| parent | fb2ab2a374745e3aebde09ecc84a8117bd216c03 (diff) | |
| download | gitlab-ce-320590180703c620cedd6eb6023548dca2d026cf.tar.gz | |
Merge branch 'fix-triggered-builds' into 'master'
Fix triggered CE builds
Closes #33512
See merge request !12046
| -rwxr-xr-x | scripts/trigger-build | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index e4603533872..dcda70d7ed8 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -9,7 +9,7 @@ params = { "token" => ENV["BUILD_TRIGGER_TOKEN"], "variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"], "variables[ALTERNATIVE_SOURCES]" => true, - "variables[ee]" => ENV["EE_PACKAGE"] + "variables[ee]" => ENV["EE_PACKAGE"] || "false" } Dir.glob("*_VERSION").each do |version_file| @@ -19,4 +19,9 @@ end res = Net::HTTP.post_form(uri, params) pipeline_id = JSON.parse(res.body)['id'] -puts "Triggered pipeline can be found at https://gitlab.com/gitlab-org/omnibus-gitlab/pipelines/#{pipeline_id}" +unless pipeline_id.nil? + puts "Triggered pipeline can be found at https://gitlab.com/gitlab-org/omnibus-gitlab/pipelines/#{pipeline_id}" +else + puts "Trigger failed. The response from trigger is: " + puts res.body +end |