From 4d7c6a61d7783f5904cf92cca8f216db1d024a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Wed, 10 Oct 2018 12:08:44 +0200 Subject: Improve the variables passed in trigger-build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the variable names consistent by following the `TOP_UPSTREAM_SOURCE_*` pattern. Signed-off-by: Rémy Coutable --- scripts/trigger-build | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'scripts/trigger-build') 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 -- cgit v1.2.3