summaryrefslogtreecommitdiff
path: root/lib/ci
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-09-14 19:52:28 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-19 10:07:12 +0200
commitba5bd3d1d64b1f56c39e4ddd03270de6820b2f7b (patch)
tree7d85a4c4c4b7cf74d7cf1e973a0a5991fb5007d7 /lib/ci
parenta4638dddf22797f46d72ea7b73c8453ba68645ab (diff)
downloadgitlab-ce-ba5bd3d1d64b1f56c39e4ddd03270de6820b2f7b.tar.gz
Add new CI configuration entry for the environment
Diffstat (limited to 'lib/ci')
-rw-r--r--lib/ci/gitlab_ci_yaml_processor.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index caa815f720f..94a63508f79 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -60,7 +60,7 @@ module Ci
name: job[:name].to_s,
allow_failure: job[:allow_failure] || false,
when: job[:when] || 'on_success',
- environment: job[:environment],
+ environment: job.fetch(:environment, {})[:name],
yaml_variables: yaml_variables(name),
options: {
image: job[:image],
@@ -69,6 +69,7 @@ module Ci
cache: job[:cache],
dependencies: job[:dependencies],
after_script: job[:after_script],
+ environment: job[:environment],
}.compact
}
end