Commit b05a3643 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'qa-pass-gitlab_ref_slug-to-cng-triggered-pipelines' into 'master'

Pass GITLAB_REF_SLUG to CNG triggered pipelines

See merge request gitlab-org/gitlab-ce!23435
parents 77c26777 93420f50
...@@ -68,6 +68,7 @@ module Trigger ...@@ -68,6 +68,7 @@ module Trigger
def base_variables def base_variables
{ {
'GITLAB_REF_SLUG' => ref_slug,
'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'], 'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'],
'TRIGGER_SOURCE' => ENV['CI_JOB_URL'], 'TRIGGER_SOURCE' => ENV['CI_JOB_URL'],
'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'], 'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'],
...@@ -76,6 +77,12 @@ module Trigger ...@@ -76,6 +77,12 @@ module Trigger
} }
end end
def ref_slug
return 'master' if ENV['CI_COMMIT_REF_SLUG'] =~ %r{(\Aqa[/-]|-qa\z)}
ENV['CI_COMMIT_REF_SLUG']
end
# Read version files from all components # Read version files from all components
def version_file_variables def version_file_variables
Dir.glob("*_VERSION").each_with_object({}) do |version_file, params| Dir.glob("*_VERSION").each_with_object({}) do |version_file, params|
...@@ -106,18 +113,11 @@ module Trigger ...@@ -106,18 +113,11 @@ module Trigger
def extra_variables def extra_variables
{ {
'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'], 'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'],
'GITLAB_REF_SLUG' => ref_slug,
'ALTERNATIVE_SOURCES' => 'true', 'ALTERNATIVE_SOURCES' => 'true',
'ee' => Trigger.ee? ? 'true' : 'false', 'ee' => Trigger.ee? ? 'true' : 'false',
'QA_BRANCH' => ENV['QA_BRANCH'] || 'master' 'QA_BRANCH' => ENV['QA_BRANCH'] || 'master'
} }
end end
def ref_slug
return 'master' if ENV['CI_COMMIT_REF_SLUG'] =~ %r{(\Aqa[/-]|-qa\z)}
ENV['CI_COMMIT_REF_SLUG']
end
end end
class CNG < Base class CNG < Base
......
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