diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 14:44:47 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-09 14:44:47 +0000 |
commit | 2aa084a484784bc72e85dbaa82189a66a913e352 (patch) | |
tree | 9b9099286a501d592307d89e4965ea4663e0fb41 | |
parent | f59a44dbdf616d29e0185090a1401a6706aef33f (diff) | |
parent | 784941eee6fb3ce8b2cdccf2eb75e908a9b15d7a (diff) | |
download | gitlab-ce-2aa084a484784bc72e85dbaa82189a66a913e352.tar.gz |
Merge branch 'improve-trigger-build-output' into 'master'
Increase verbosity of triggered build
Closes omnibus-gitlab#2318
See merge request !11188
-rw-r--r-- | .gitlab-ci.yml | 13 | ||||
-rwxr-xr-x | scripts/trigger-build | 21 |
2 files changed, 23 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 588f255eff8..88d536fa9b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,6 +141,7 @@ stages: # Trigger a package build on omnibus-gitlab repository build-package: + before_script: [] services: [] variables: SETUP_DB: "false" @@ -148,17 +149,7 @@ build-package: stage: build when: manual script: - # If no branch in omnibus is specified, trigger pipeline against master - - if [ -z "$OMNIBUS_BRANCH" ] ; then export OMNIBUS_BRANCH=master ;fi - - echo "token=${BUILD_TRIGGER_TOKEN}" > version_details - - echo "ref=${OMNIBUS_BRANCH}" >> version_details - - echo "variables[ALTERNATIVE_SOURCES]=true" >> version_details - - echo "variables[GITLAB_VERSION]=${CI_COMMIT_SHA}" >> version_details - # Collect version details of all components - - for f in *_VERSION; do echo "variables[$f]=$(cat $f)" >> version_details; done - # Trigger the API and pass values collected above as parameters to it - - cat version_details | tr '\n' '&' | curl -X POST https://gitlab.com/api/v4/projects/20699/trigger/pipeline --data-binary @- - - rm version_details + - scripts/trigger-build # Prepare and merge knapsack tests knapsack: diff --git a/scripts/trigger-build b/scripts/trigger-build new file mode 100755 index 00000000000..741e6361f01 --- /dev/null +++ b/scripts/trigger-build @@ -0,0 +1,21 @@ +#!/usr/bin/env ruby + +require 'net/http' +require 'json' + +uri = URI('https://gitlab.com/api/v4/projects/20699/trigger/pipeline') +params = { + "ref" => ENV["OMNIBUS_BRANCH"] || "master", + "token" => ENV["BUILD_TRIGGER_TOKEN"], + "variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"], + "variables[ALTERNATIVE_SOURCES]" => true, +} + +Dir.glob("*_VERSION").each do |version_file| + params["variables[#{version_file}]"] = File.read(version_file).strip +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}" |