Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fb882914
Commit
fb882914
authored
Dec 11, 2019
by
Cédric Tabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds 'artifacts' keyword in defaults
parent
0027a7aa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
8 deletions
+13
-8
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+1
-0
ee/spec/lib/ee/gitlab/ci/config/entry/bridge_spec.rb
ee/spec/lib/ee/gitlab/ci/config/entry/bridge_spec.rb
+1
-1
lib/gitlab/ci/config/entry/default.rb
lib/gitlab/ci/config/entry/default.rb
+6
-2
lib/gitlab/ci/config/entry/job.rb
lib/gitlab/ci/config/entry/job.rb
+4
-4
spec/lib/gitlab/ci/config/entry/default_spec.rb
spec/lib/gitlab/ci/config/entry/default_spec.rb
+1
-1
No files found.
doc/ci/yaml/README.md
View file @
fb882914
...
...
@@ -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
)
...
...
ee/spec/lib/ee/gitlab/ci/config/entry/bridge_spec.rb
View file @
fb882914
...
...
@@ -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
...
...
lib/gitlab/ci/config/entry/default.rb
View file @
fb882914
...
...
@@ -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
...
...
lib/gitlab/ci/config/entry/job.rb
View file @
fb882914
...
...
@@ -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
...
...
spec/lib/gitlab/ci/config/entry/default_spec.rb
View file @
fb882914
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment