diff options
author | Marin Jankovski <marin@gitlab.com> | 2017-05-29 11:55:20 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2017-05-29 11:55:20 +0000 |
commit | 8a9e2415ca92897f2920127b7c1986a7c33d2035 (patch) | |
tree | c3a06caf38d0785ebc6643bb3b3123af42428827 | |
parent | f0a78f89cdc9218ac956e480baae8402a515a7cf (diff) | |
parent | 88811a7733c14e363c8cc86ad6841d3fff7b83f1 (diff) | |
download | gitlab-ce-8a9e2415ca92897f2920127b7c1986a7c33d2035.tar.gz |
Merge branch '32918-enable-ee-trigger' into 'master'
Pass EE variable to trigger if defined
Closes #32918
See merge request !11710
-rwxr-xr-x | scripts/trigger-build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/trigger-build b/scripts/trigger-build index 565bc314ef1..e4603533872 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -8,7 +8,8 @@ params = { "ref" => ENV["OMNIBUS_BRANCH"] || "master", "token" => ENV["BUILD_TRIGGER_TOKEN"], "variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"], - "variables[ALTERNATIVE_SOURCES]" => true + "variables[ALTERNATIVE_SOURCES]" => true, + "variables[ee]" => ENV["EE_PACKAGE"] } Dir.glob("*_VERSION").each do |version_file| |