summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-10-22 16:33:32 +0200
committerRémy Coutable <remy@rymai.me>2018-11-06 16:17:01 +0100
commit6a189c1fcde531337f05d2fb6517943ba2a5bdad (patch)
tree97ec4211eb2aa938b54544d5f98bf29d2f91e749 /scripts
parentd0c58a97c8a053c0beec7c13c1c6ec5042120ef1 (diff)
downloadgitlab-ce-6a189c1fcde531337f05d2fb6517943ba2a5bdad.tar.gz
Allow to override the gitlab-qa ref for the downstream triggersupport-gitlab-qa-post-status-to-upstream-commit
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/trigger-build3
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