summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-04-08 11:02:26 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-04-18 13:17:47 +0200
commita1363d39c6fe79d830dbce468c02880d2a5d7996 (patch)
tree62dff2b35c5032f896ab8414f21982e200fa49ca /lib
parente32fc7567be2ff2cc995648e675de18133f8a066 (diff)
downloadgitlab-ce-a1363d39c6fe79d830dbce468c02880d2a5d7996.tar.gz
Add `variables` keyword to job in CI config YAML
Diffstat (limited to 'lib')
-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 b7209c14148..712dc4492c5 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -7,7 +7,7 @@ module Ci
ALLOWED_YAML_KEYS = [:before_script, :image, :services, :types, :stages, :variables, :cache]
ALLOWED_JOB_KEYS = [:tags, :script, :only, :except, :type, :image, :services,
:allow_failure, :type, :stage, :when, :artifacts, :cache,
- :dependencies]
+ :dependencies, :variables]
attr_reader :before_script, :image, :services, :variables, :path, :cache
@@ -85,6 +85,7 @@ module Ci
artifacts: job[:artifacts],
cache: job[:cache] || @cache,
dependencies: job[:dependencies],
+ variables: job[:variables],
}.compact
}
end