Commit 938db913 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch...

Merge branch '62735-for-stable-branches-build-cng-images-from-corresponding-stable-branches-in-cng-mirror-project' into 'master'

Pass branch name to the CNG pipeline for stable branches

See merge request gitlab-org/gitlab-ce!29617
parents e8aff835 7fd2d687
...@@ -122,7 +122,14 @@ module Trigger ...@@ -122,7 +122,14 @@ module Trigger
end end
def ref def ref
ENV['CNG_BRANCH'] || 'master' default_ref =
if ENV['CI_COMMIT_REF_NAME'] =~ /^[\d-]+-stable(-ee)?$/
ENV['CI_COMMIT_REF_NAME']
else
'master'
end
ENV['CNG_BRANCH'] || default_ref
end end
def trigger_token def trigger_token
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment