diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 15:10:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 15:10:27 +0300 |
| commit | 3b963d69199b2e4dd0a0c0b64efcf715242a5d8b (patch) | |
| tree | 2719bcba9c985f4ee27b43d29deb202eade9a5df /scripts | |
| parent | d06c308380072db8cfac10f27fc114f6093ce8b6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/trigger-build | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index 7fc550d86ee..633e4dda808 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -138,8 +138,12 @@ module Trigger def extra_variables # Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts due to pipeline for merged results # and fallback to CI_COMMIT_SHA for the `detached` pipelines. + # We also set IMAGE_TAG so the GitLab and QA docker images are tagged with + # that SHA. + source_sha = Trigger.non_empty_variable_value('CI_MERGE_REQUEST_SOURCE_BRANCH_SHA') || ENV['CI_COMMIT_SHA'] { - 'GITLAB_VERSION' => Trigger.non_empty_variable_value('CI_MERGE_REQUEST_SOURCE_BRANCH_SHA') || ENV['CI_COMMIT_SHA'], + 'GITLAB_VERSION' => source_sha, + 'IMAGE_TAG' => source_sha, 'ALTERNATIVE_SOURCES' => 'true', 'SECURITY_SOURCES' => Trigger.security? ? 'true' : 'false', 'ee' => Trigger.ee? ? 'true' : 'false', |