summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-10-10 12:08:44 +0200
committerRémy Coutable <remy@rymai.me>2018-10-10 12:10:04 +0200
commit4d7c6a61d7783f5904cf92cca8f216db1d024a2c (patch)
treee45415b110df5c327f53f82446d9fd08b3a1e5df /scripts
parent02b456dbe855781998856dfdc99632b4c3232720 (diff)
downloadgitlab-ce-4d7c6a61d7783f5904cf92cca8f216db1d024a2c.tar.gz
Improve the variables passed in trigger-build
Make the variable names consistent by following the `TOP_UPSTREAM_SOURCE_*` pattern. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/trigger-build9
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build
index 285f810c3c0..b76cd5dd6f0 100755
--- a/scripts/trigger-build
+++ b/scripts/trigger-build
@@ -68,12 +68,11 @@ module Trigger
def base_variables
{
- 'TOP_UPSTREAM_TRIGGER_PROJECT' => ENV['TOP_UPSTREAM_TRIGGER_PROJECT'] || ENV['CI_PROJECT_PATH'],
- 'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_COMMIT_SHA'],
- '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