diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-01 10:31:49 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-12-01 10:31:49 +0000 |
| commit | f999fa4c11db5425d0279dfb418544dd5d8bfa3d (patch) | |
| tree | fdbf6407f0096f7f22c15bcaf7c24be12ece0711 | |
| parent | 3b6fba728fdef4b1824dcfc33539e696e4f17cf5 (diff) | |
| parent | c9fd4380807ec23f0f7f91ea0f97c149ed502cd8 (diff) | |
| download | gitlab-ce-f999fa4c11db5425d0279dfb418544dd5d8bfa3d.tar.gz | |
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
| -rwxr-xr-x | scripts/trigger-build-omnibus | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/trigger-build-omnibus b/scripts/trigger-build-omnibus index 0c662ac19d2..3c5c22c9372 100755 --- a/scripts/trigger-build-omnibus +++ b/scripts/trigger-build-omnibus @@ -30,12 +30,16 @@ module Omnibus private + def ee? + File.exist?('CHANGELOG-EE.md') + end + def env_params { "ref" => ENV["OMNIBUS_BRANCH"] || "master", "variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"], "variables[ALTERNATIVE_SOURCES]" => true, - "variables[ee]" => ENV["EE_PACKAGE"] || "false" + "variables[ee]" => ee? ? 'true' : 'false' } end |