summaryrefslogtreecommitdiff
path: root/lib/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-04-17 08:59:57 -0400
committerKamil Trzcinski <ayufan@ayufan.eu>2016-04-17 08:59:57 -0400
commitcc57d61023c6dd5ef274bac5d4e6cde1cae97d2c (patch)
treedb842305c52cbbef2b63bf225a80f80339ce44a8 /lib/ci
parentb340b59743e8cd47fc1f4fa2020b400d82bfd86e (diff)
downloadgitlab-ce-cc57d61023c6dd5ef274bac5d4e6cde1cae97d2c.tar.gz
Rename finally_script to after_script
Diffstat (limited to 'lib/ci')
-rw-r--r--lib/ci/gitlab_ci_yaml_processor.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index be2462949f1..a87329c296a 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -4,12 +4,12 @@ module Ci
DEFAULT_STAGES = %w(build test deploy)
DEFAULT_STAGE = 'test'
- ALLOWED_YAML_KEYS = [:before_script, :finally_script, :image, :services, :types, :stages, :variables, :cache]
+ ALLOWED_YAML_KEYS = [:before_script, :after_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]
- attr_reader :before_script, :finally_script, :image, :services, :variables, :path, :cache
+ attr_reader :before_script, :after_script, :image, :services, :variables, :path, :cache
def initialize(config, path = nil)
@config = YAML.safe_load(config, [Symbol], [], true)
@@ -44,7 +44,7 @@ module Ci
def initial_parsing
@before_script = @config[:before_script] || []
- @finally_script = @config[:finally_script]
+ @after_script = @config[:after_script]
@image = @config[:image]
@services = @config[:services]
@stages = @config[:stages] || @config[:types]
@@ -86,7 +86,7 @@ module Ci
artifacts: job[:artifacts],
cache: job[:cache] || @cache,
dependencies: job[:dependencies],
- finally_script: @finally_script,
+ after_script: @after_script,
}.compact
}
end
@@ -104,8 +104,8 @@ module Ci
raise ValidationError, "before_script should be an array of strings"
end
- unless @finally_script.nil? || validate_array_of_strings(@finally_script)
- raise ValidationError, "finally_script should be an array of strings"
+ unless @after_script.nil? || validate_array_of_strings(@after_script)
+ raise ValidationError, "after_script should be an array of strings"
end
unless @image.nil? || @image.is_a?(String)