Commit f999fa4c authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'set-ee-variable-in-trigger' into 'master'

Set EE variable for package build triggers from GitLab EE repository

Closes omnibus-gitlab#3006

See merge request gitlab-org/gitlab-ce!15677
parents 3b6fba72 c9fd4380
...@@ -30,12 +30,16 @@ module Omnibus ...@@ -30,12 +30,16 @@ module Omnibus
private private
def ee?
File.exist?('CHANGELOG-EE.md')
end
def env_params def env_params
{ {
"ref" => ENV["OMNIBUS_BRANCH"] || "master", "ref" => ENV["OMNIBUS_BRANCH"] || "master",
"variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"], "variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"],
"variables[ALTERNATIVE_SOURCES]" => true, "variables[ALTERNATIVE_SOURCES]" => true,
"variables[ee]" => ENV["EE_PACKAGE"] || "false" "variables[ee]" => ee? ? 'true' : 'false'
} }
end end
......
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