diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /scripts/trigger-build | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
| download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'scripts/trigger-build')
| -rwxr-xr-x | scripts/trigger-build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index 3a9301bda3b..0d8a46bdd2d 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -136,7 +136,7 @@ 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 (merged result commit) for the non-MR pipelines. + # and fallback to CI_COMMIT_SHA for the non-MR pipelines. # See https://docs.gitlab.com/ee/development/testing_guide/end_to_end/index.html#with-pipeline-for-merged-results. # We also set IMAGE_TAG so the GitLab Docker image is tagged with that SHA. source_sha = Trigger.non_empty_variable_value('CI_MERGE_REQUEST_SOURCE_BRANCH_SHA') || ENV['CI_COMMIT_SHA'] @@ -172,7 +172,7 @@ module Trigger end def trigger_token - ENV['BUILD_TRIGGER_TOKEN'] + ENV['CI_JOB_TOKEN'] end def extra_variables |