Commit fb882914 authored by Cédric Tabin's avatar Cédric Tabin

Adds 'artifacts' keyword in defaults

parent 0027a7aa
......@@ -137,6 +137,7 @@ The following job parameters can be defined inside a `default:` block:
- [`after_script`](#before_script-and-after_script)
- [`tags`](#tags)
- [`cache`](#cache)
- [`artifacts`](#artifacts)
- [`retry`](#retry)
- [`timeout`](#timeout)
- [`interruptible`](#interruptible)
......
......@@ -14,7 +14,7 @@ describe EE::Gitlab::Ci::Config::Entry::Bridge do
# as they do not have sense in context of Bridge
let(:ignored_inheritable_columns) do
%i[before_script after_script image services cache interruptible timeout
retry tags]
retry tags artifacts]
end
end
......
......@@ -15,7 +15,7 @@ module Gitlab
ALLOWED_KEYS = %i[before_script image services
after_script cache interruptible
timeout retry tags].freeze
timeout retry tags artifacts].freeze
validations do
validates :config, allowed_keys: ALLOWED_KEYS
......@@ -57,8 +57,12 @@ module Gitlab
description: 'Set the default tags.',
inherit: false
entry :artifacts, Entry::Artifacts,
description: 'Default artifacts.',
inherit: false
helpers :before_script, :image, :services, :after_script, :cache, :interruptible,
:timeout, :retry, :tags
:timeout, :retry, :tags, :artifacts
private
......
......@@ -114,6 +114,10 @@ module Gitlab
description: 'Set the tags.',
inherit: true
entry :artifacts, Entry::Artifacts,
description: 'Artifacts configuration for this job.',
inherit: true
entry :only, Entry::Policy,
description: 'Refs policy this job will be executed for.',
default: Entry::Policy::DEFAULT_ONLY,
......@@ -139,10 +143,6 @@ module Gitlab
description: 'Environment variables available for this job.',
inherit: false
entry :artifacts, Entry::Artifacts,
description: 'Artifacts configuration for this job.',
inherit: false
entry :environment, Entry::Environment,
description: 'Environment configuration for this job.',
inherit: false
......
......@@ -27,7 +27,7 @@ describe Gitlab::Ci::Config::Entry::Default do
expect(described_class.nodes.keys)
.to match_array(%i[before_script image services
after_script cache interruptible
timeout retry tags])
timeout retry tags artifacts])
end
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment