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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
81dfabad
Commit
81dfabad
authored
May 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added when to artifacts
parent
53498e42
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
0 deletions
+48
-0
CHANGELOG
CHANGELOG
+1
-0
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+24
-0
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+23
-0
No files found.
CHANGELOG
View file @
81dfabad
...
@@ -27,6 +27,7 @@ v 8.9.0 (unreleased)
...
@@ -27,6 +27,7 @@ v 8.9.0 (unreleased)
- Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
- Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
- Changed the Slack build message to use the singular duration if necessary (Aran Koning)
- Changed the Slack build message to use the singular duration if necessary (Aran Koning)
- Fix issues filter when ordering by milestone
- Fix issues filter when ordering by milestone
- Added artifacts:when to .gitlab-ci.yml - this requires GitLab Runner 1.3
- Todos will display target state if issuable target is 'Closed' or 'Merged'
- Todos will display target state if issuable target is 'Closed' or 'Merged'
- Fix bug when sorting issues by milestone due date and filtering by two or more labels
- Fix bug when sorting issues by milestone due date and filtering by two or more labels
- Add support for using Yubikeys (U2F) for two-factor authentication
- Add support for using Yubikeys (U2F) for two-factor authentication
...
...
lib/ci/gitlab_ci_yaml_processor.rb
View file @
81dfabad
...
@@ -8,6 +8,8 @@ module Ci
...
@@ -8,6 +8,8 @@ module Ci
ALLOWED_JOB_KEYS
=
[
:tags
,
:script
,
:only
,
:except
,
:type
,
:image
,
:services
,
ALLOWED_JOB_KEYS
=
[
:tags
,
:script
,
:only
,
:except
,
:type
,
:image
,
:services
,
:allow_failure
,
:type
,
:stage
,
:when
,
:artifacts
,
:cache
,
:allow_failure
,
:type
,
:stage
,
:when
,
:artifacts
,
:cache
,
:dependencies
,
:before_script
,
:after_script
,
:variables
]
:dependencies
,
:before_script
,
:after_script
,
:variables
]
ALLOWED_CACHE_KEYS
=
[
:key
,
:untracked
,
:paths
]
ALLOWED_ARTIFACTS_KEYS
=
[
:name
,
:untracked
,
:paths
,
:when
]
attr_reader
:before_script
,
:after_script
,
:image
,
:services
,
:path
,
:cache
attr_reader
:before_script
,
:after_script
,
:image
,
:services
,
:path
,
:cache
...
@@ -135,6 +137,12 @@ module Ci
...
@@ -135,6 +137,12 @@ module Ci
end
end
def
validate_global_cache!
def
validate_global_cache!
@cache
.
keys
.
each
do
|
key
|
unless
ALLOWED_CACHE_KEYS
.
include?
key
raise
ValidationError
,
"
#{
name
}
cache unknown parameter
#{
key
}
"
end
end
if
@cache
[
:key
]
&&
!
validate_string
(
@cache
[
:key
])
if
@cache
[
:key
]
&&
!
validate_string
(
@cache
[
:key
])
raise
ValidationError
,
"cache:key parameter should be a string"
raise
ValidationError
,
"cache:key parameter should be a string"
end
end
...
@@ -233,6 +241,12 @@ module Ci
...
@@ -233,6 +241,12 @@ module Ci
end
end
def
validate_job_cache!
(
name
,
job
)
def
validate_job_cache!
(
name
,
job
)
job
[
:cache
].
keys
.
each
do
|
key
|
unless
ALLOWED_CACHE_KEYS
.
include?
key
raise
ValidationError
,
"
#{
name
}
job: cache unknown parameter
#{
key
}
"
end
end
if
job
[
:cache
][
:key
]
&&
!
validate_string
(
job
[
:cache
][
:key
])
if
job
[
:cache
][
:key
]
&&
!
validate_string
(
job
[
:cache
][
:key
])
raise
ValidationError
,
"
#{
name
}
job: cache:key parameter should be a string"
raise
ValidationError
,
"
#{
name
}
job: cache:key parameter should be a string"
end
end
...
@@ -247,6 +261,12 @@ module Ci
...
@@ -247,6 +261,12 @@ module Ci
end
end
def
validate_job_artifacts!
(
name
,
job
)
def
validate_job_artifacts!
(
name
,
job
)
job
[
:artifacts
].
keys
.
each
do
|
key
|
unless
ALLOWED_ARTIFACTS_KEYS
.
include?
key
raise
ValidationError
,
"
#{
name
}
job: artifacts unknown parameter
#{
key
}
"
end
end
if
job
[
:artifacts
][
:name
]
&&
!
validate_string
(
job
[
:artifacts
][
:name
])
if
job
[
:artifacts
][
:name
]
&&
!
validate_string
(
job
[
:artifacts
][
:name
])
raise
ValidationError
,
"
#{
name
}
job: artifacts:name parameter should be a string"
raise
ValidationError
,
"
#{
name
}
job: artifacts:name parameter should be a string"
end
end
...
@@ -258,6 +278,10 @@ module Ci
...
@@ -258,6 +278,10 @@ module Ci
if
job
[
:artifacts
][
:paths
]
&&
!
validate_array_of_strings
(
job
[
:artifacts
][
:paths
])
if
job
[
:artifacts
][
:paths
]
&&
!
validate_array_of_strings
(
job
[
:artifacts
][
:paths
])
raise
ValidationError
,
"
#{
name
}
job: artifacts:paths parameter should be an array of strings"
raise
ValidationError
,
"
#{
name
}
job: artifacts:paths parameter should be an array of strings"
end
end
if
job
[
:artifacts
][
:when
]
&&
!
job
[
:artifacts
][
:when
].
in?
(
%w(on_success on_failure always)
)
raise
ValidationError
,
"
#{
name
}
job: artifacts:when parameter should be on_success, on_failure or always"
end
end
end
def
validate_job_dependencies!
(
name
,
job
)
def
validate_job_dependencies!
(
name
,
job
)
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
81dfabad
...
@@ -601,6 +601,22 @@ module Ci
...
@@ -601,6 +601,22 @@ module Ci
allow_failure:
false
allow_failure:
false
})
})
end
end
%w(on_success on_failure always)
.
each
do
|
when_state
|
it
"returns artifacts for when
#{
when_state
}
defined"
do
config
=
YAML
.
dump
({
rspec:
{
script:
"rspec"
,
artifacts:
{
paths:
[
"logs/"
,
"binaries/"
],
when:
when_state
}
}
})
config_processor
=
GitlabCiYamlProcessor
.
new
(
config
,
path
)
builds
=
config_processor
.
builds_for_stage_and_ref
(
"test"
,
"master"
)
expect
(
builds
.
size
).
to
eq
(
1
)
expect
(
builds
.
first
[
:options
][
:artifacts
][
:when
]).
to
eq
(
when_state
)
end
end
end
end
describe
"Dependencies"
do
describe
"Dependencies"
do
...
@@ -967,6 +983,13 @@ EOT
...
@@ -967,6 +983,13 @@ EOT
end
.
to
raise_error
(
GitlabCiYamlProcessor
::
ValidationError
,
"rspec job: artifacts:name parameter should be a string"
)
end
.
to
raise_error
(
GitlabCiYamlProcessor
::
ValidationError
,
"rspec job: artifacts:name parameter should be a string"
)
end
end
it
"returns errors if job artifacts:when is not an a predefined value"
do
config
=
YAML
.
dump
({
types:
[
"build"
,
"test"
],
rspec:
{
script:
"test"
,
artifacts:
{
when:
1
}
}
})
expect
do
GitlabCiYamlProcessor
.
new
(
config
)
end
.
to
raise_error
(
GitlabCiYamlProcessor
::
ValidationError
,
"rspec job: artifacts:when parameter should be on_success, on_failure or always"
)
end
it
"returns errors if job artifacts:untracked is not an array of strings"
do
it
"returns errors if job artifacts:untracked is not an array of strings"
do
config
=
YAML
.
dump
({
types:
[
"build"
,
"test"
],
rspec:
{
script:
"test"
,
artifacts:
{
untracked:
"string"
}
}
})
config
=
YAML
.
dump
({
types:
[
"build"
,
"test"
],
rspec:
{
script:
"test"
,
artifacts:
{
untracked:
"string"
}
}
})
expect
do
expect
do
...
...
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