diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-16 22:39:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-16 22:39:33 +0000 |
| commit | a706b3735ef01072401dd1ee67ba0586a2fdf61c (patch) | |
| tree | cd16c664e7c0a207c8a2cc7ff0c97d6e5c619b92 /scripts/trigger-build | |
| parent | 90056ed25b547537b02b29715e6153d3aab4cc79 (diff) | |
| parent | 68eafa50e925ac6da60d84a67884c53c13552315 (diff) | |
| download | gitlab-ce-a706b3735ef01072401dd1ee67ba0586a2fdf61c.tar.gz | |
Merge branch 'master' into 'dm-document-role-maintainer'
# Conflicts:
# doc/development/code_review.md
Diffstat (limited to 'scripts/trigger-build')
| -rwxr-xr-x | scripts/trigger-build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index 4534fcadebf..b76cd5dd6f0 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -68,11 +68,11 @@ module Trigger def base_variables { - 'TOP_UPSTREAM_TRIGGER_PROJECT' => ENV['TOP_UPSTREAM_TRIGGER_PROJECT'] || ENV['CI_PROJECT_PATH'], - 'UPSTREAM_TRIGGER_PROJECT' => ENV['CI_PROJECT_PATH'], - 'UPSTREAM_TRIGGER_SOURCE' => ENV['TRIGGER_SOURCE'], 'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'], - 'TRIGGER_SOURCE' => ENV['CI_JOB_URL'] + 'TRIGGER_SOURCE' => ENV['CI_JOB_URL'], + 'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'], + 'TOP_UPSTREAM_SOURCE_JOB' => ENV['CI_JOB_URL'], + 'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_COMMIT_SHA'] } end |