diff options
author | Rémy Coutable <remy@rymai.me> | 2018-10-10 11:39:02 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-10-10 12:10:04 +0200 |
commit | 02b456dbe855781998856dfdc99632b4c3232720 (patch) | |
tree | 661eb07b91c2bf746249fa00985f1764bc7c131c /scripts | |
parent | bdd60cd73c39cdccae5a29d79327bd64479348f5 (diff) | |
download | gitlab-ce-02b456dbe855781998856dfdc99632b4c3232720.tar.gz |
Pass 'TOP_UPSTREAM_SOURCE_SHA' in trigger-build
This is needed because `GITLAB_VERSION` has a special meaning in
`omnibus-gitlab` triggers: this is the GitLab version to build.
The problem is that `omnibus-gitlab` also has triggers to run QA for an
`omnibus-gitlab` commit, and if we use `GITLAB_VERSION` in that case,
the comment would be posted on the GitLab CE/EE commit (stored in
`GITLAB_VERSION`), whci hwouldn't make any sense.
Thus we need `TOP_UPSTREAM_SOURCE_SHA` to represent the commit on
which we want to leave a comment.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/trigger-build | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index 4534fcadebf..285f810c3c0 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -69,6 +69,7 @@ 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'], |