diff options
author | Rémy Coutable <remy@rymai.me> | 2018-11-26 16:36:48 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-11-26 16:36:48 +0000 |
commit | cae50e42e7ead68cfd00b7761f1b7f5572d87148 (patch) | |
tree | e4a7db1162d0ab883fc6c90fdd35f51f1a250331 | |
parent | 242baf1287302bded45164558986150ac8d9881f (diff) | |
parent | 17756db81dfec9b2ed5b743181760e6192a0da6e (diff) | |
download | gitlab-ce-cae50e42e7ead68cfd00b7761f1b7f5572d87148.tar.gz |
Merge branch 'qa-followup-23267-for-qa-branches' into 'master'
Override CI_COMMIT_REF_SLUG for QA branches
See merge request gitlab-org/gitlab-ce!23346
-rwxr-xr-x | scripts/trigger-build | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index d02acd01a2a..d2c71f5be3e 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -106,12 +106,18 @@ module Trigger def extra_variables { 'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'], - 'GITLAB_REF_SLUG' => ENV['CI_COMMIT_REF_SLUG'], + 'GITLAB_REF_SLUG' => ref_slug, 'ALTERNATIVE_SOURCES' => 'true', 'ee' => Trigger.ee? ? 'true' : 'false', 'QA_BRANCH' => ENV['QA_BRANCH'] || 'master' } end + + def ref_slug + return 'master' if ENV['CI_COMMIT_REF_SLUG'] =~ %r{(\Aqa[/-]|-qa\z)} + + ENV['CI_COMMIT_REF_SLUG'] + end end class CNG < Base |