diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-10 15:45:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-10 15:45:09 +0000 |
| commit | dbbeec7d71b85de6dc59261ac90cc6a0088c8eed (patch) | |
| tree | 6fea068ef0866a6f025e37fea5f41ec8ec018291 | |
| parent | b3dfbb8d6b94123c713d95bbf8d115c8d24f4955 (diff) | |
| parent | 4d7c6a61d7783f5904cf92cca8f216db1d024a2c (diff) | |
| download | gitlab-ce-dbbeec7d71b85de6dc59261ac90cc6a0088c8eed.tar.gz | |
Merge branch 'add-top_upstream_source_sha-in-trigger-build' into 'master'
Add `TOP_UPSTREAM_SOURCE_SHA` in `scripts/trigger-build`
See merge request gitlab-org/gitlab-ce!22260
| -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 |