diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-29 12:20:45 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-29 12:20:45 +0200 |
| commit | 7ef11ce3de797aa8ad0c39245e78aedd91ffa84c (patch) | |
| tree | 6d0e55e3fe4898c8fb529753df1fa764906672de | |
| parent | c8c930f3ff6e1218e7614e46874bb5279bc30fe9 (diff) | |
| download | gitlab-ce-7ef11ce3de797aa8ad0c39245e78aedd91ffa84c.tar.gz | |
Explicitly define entry node class in new CI config
| -rw-r--r-- | lib/gitlab/ci/config/node/cache.rb | 6 | ||||
| -rw-r--r-- | lib/gitlab/ci/config/node/global.rb | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/gitlab/ci/config/node/cache.rb b/lib/gitlab/ci/config/node/cache.rb index d81b2121a99..cdf8ba2e35d 100644 --- a/lib/gitlab/ci/config/node/cache.rb +++ b/lib/gitlab/ci/config/node/cache.rb @@ -8,13 +8,13 @@ module Gitlab class Cache < Entry include Configurable - node :key, Key, + node :key, Node::Key, description: 'Cache key used to define a cache affinity.' - node :untracked, Boolean, + node :untracked, Node::Boolean, description: 'Cache all untracked files.' - node :paths, Paths, + node :paths, Node::Paths, description: 'Specify which paths should be cached across builds.' validations do diff --git a/lib/gitlab/ci/config/node/global.rb b/lib/gitlab/ci/config/node/global.rb index 65919ef1eeb..fec2fe564ac 100644 --- a/lib/gitlab/ci/config/node/global.rb +++ b/lib/gitlab/ci/config/node/global.rb @@ -9,28 +9,28 @@ module Gitlab class Global < Entry include Configurable - node :before_script, Script, + node :before_script, Node::Script, description: 'Script that will be executed before each job.' - node :image, Image, + node :image, Node::Image, description: 'Docker image that will be used to execute jobs.' - node :services, Services, + node :services, Node::Services, description: 'Docker images that will be linked to the container.' - node :after_script, Script, + node :after_script, Node::Script, description: 'Script that will be executed after each job.' - node :variables, Variables, + node :variables, Node::Variables, description: 'Environment variables that will be used.' - node :stages, Stages, + node :stages, Node::Stages, description: 'Configuration of stages for this pipeline.' - node :types, Stages, + node :types, Node::Stages, description: 'Stages for this pipeline (deprecated key).' - node :cache, Cache, + node :cache, Node::Cache, description: 'Configure caching between build jobs.' helpers :before_script, :image, :services, :after_script, |