diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-11-08 17:45:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-11-08 17:45:55 +0000 |
| commit | ab61bee378ed45ff01d74742b54149533811a204 (patch) | |
| tree | 1531925f734c2748b9169d53ee2397213ce7a373 | |
| parent | 2a450e2180fcb8c374b506c202a0acd6a2cc3e2f (diff) | |
| parent | 6a189c1fcde531337f05d2fb6517943ba2a5bdad (diff) | |
| download | gitlab-ce-ab61bee378ed45ff01d74742b54149533811a204.tar.gz | |
Merge branch 'support-gitlab-qa-post-status-to-upstream-commit' into 'master'
Allow to override the gitlab-qa ref for the downstream trigger
See merge request gitlab-org/gitlab-ce!22521
| -rwxr-xr-x | scripts/trigger-build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index dd0425b6472..873c41db456 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -107,7 +107,8 @@ module Trigger { 'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'], 'ALTERNATIVE_SOURCES' => 'true', - 'ee' => Trigger.ee? ? 'true' : 'false' + 'ee' => Trigger.ee? ? 'true' : 'false', + 'QA_BRANCH' => ENV['QA_BRANCH'] || 'master' } end end |