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
Léo-Paul Géneau
gitlab-ce
Commits
67c7e0fc
Commit
67c7e0fc
authored
Sep 03, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fail jobs if its dependency is missing
parent
f9229281
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
81 additions
and
1 deletion
+81
-1
app/models/ci/build.rb
app/models/ci/build.rb
+6
-0
app/models/commit_status.rb
app/models/commit_status.rb
+2
-1
app/services/ci/register_job_service.rb
app/services/ci/register_job_service.rb
+3
-0
lib/gitlab/ci/error/missing_dependencies.rb
lib/gitlab/ci/error/missing_dependencies.rb
+7
-0
spec/lib/gitlab/ci/error/missing_dependencies_spec.rb
spec/lib/gitlab/ci/error/missing_dependencies_spec.rb
+5
-0
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+30
-0
spec/services/ci/register_job_service_spec.rb
spec/services/ci/register_job_service_spec.rb
+28
-0
No files found.
app/models/ci/build.rb
View file @
67c7e0fc
...
@@ -139,6 +139,12 @@ module Ci
...
@@ -139,6 +139,12 @@ module Ci
Ci
::
Build
.
retry
(
build
,
build
.
user
)
Ci
::
Build
.
retry
(
build
,
build
.
user
)
end
end
end
end
before_transition
any
=>
[
:running
]
do
|
build
|
if
!
build
.
empty_dependencies?
&&
build
.
dependencies
.
empty?
raise
Gitlab
::
Ci
::
Error
::
MissingDependencies
end
end
end
end
def
detailed_status
(
current_user
)
def
detailed_status
(
current_user
)
...
...
app/models/commit_status.rb
View file @
67c7e0fc
...
@@ -43,7 +43,8 @@ class CommitStatus < ActiveRecord::Base
...
@@ -43,7 +43,8 @@ class CommitStatus < ActiveRecord::Base
script_failure:
1
,
script_failure:
1
,
api_failure:
2
,
api_failure:
2
,
stuck_or_timeout_failure:
3
,
stuck_or_timeout_failure:
3
,
runner_system_failure:
4
runner_system_failure:
4
,
missing_dependency_failure:
5
}
}
##
##
...
...
app/services/ci/register_job_service.rb
View file @
67c7e0fc
...
@@ -54,6 +54,9 @@ module Ci
...
@@ -54,6 +54,9 @@ module Ci
# we still have to return 409 in the end,
# we still have to return 409 in the end,
# to make sure that this is properly handled by runner.
# to make sure that this is properly handled by runner.
valid
=
false
valid
=
false
rescue
Gitlab
::
Ci
::
Error
::
MissingDependencies
build
.
drop!
(
:missing_dependency_failure
)
valid
=
false
end
end
end
end
...
...
lib/gitlab/ci/error/missing_dependencies.rb
0 → 100644
View file @
67c7e0fc
module
Gitlab
module
Ci
module
Error
class
MissingDependencies
<
StandardError
;
end
end
end
end
spec/lib/gitlab/ci/error/missing_dependencies_spec.rb
0 → 100644
View file @
67c7e0fc
require
'spec_helper'
describe
Gitlab
::
Ci
::
Error
::
MissingDependencies
do
it
{
expect
(
described_class
).
to
be
<
StandardError
}
end
spec/models/ci/build_spec.rb
View file @
67c7e0fc
...
@@ -1868,6 +1868,36 @@ describe Ci::Build do
...
@@ -1868,6 +1868,36 @@ describe Ci::Build do
end
end
end
end
describe
'state transition: any => [:running]'
do
let
(
:build
)
{
create
(
:ci_build
,
:pending
,
pipeline:
pipeline
,
stage_idx:
1
,
options:
options
)
}
context
'when "dependencies" keyword is not defined'
do
let
(
:options
)
{
{}
}
it
{
expect
{
build
.
run!
}.
not_to
raise_error
}
end
context
'when "dependencies" keyword is empty'
do
let
(
:options
)
{
{
dependencies:
[]
}
}
it
{
expect
{
build
.
run!
}.
not_to
raise_error
}
end
context
'when "dependencies" keyword is specified'
do
let
(
:options
)
{
{
dependencies:
[
'test'
]
}
}
context
'when a depended job exists'
do
let!
(
:pre_build
)
{
create
(
:ci_build
,
pipeline:
pipeline
,
name:
'test'
,
stage_idx:
0
)
}
it
{
expect
{
build
.
run!
}.
not_to
raise_error
}
end
context
'when depended jobs do not exist'
do
it
{
expect
{
build
.
run!
}.
to
raise_error
(
Gitlab
::
Ci
::
Error
::
MissingDependencies
)
}
end
end
end
describe
'state transition when build fails'
do
describe
'state transition when build fails'
do
let
(
:service
)
{
MergeRequests
::
AddTodoWhenBuildFailsService
.
new
(
project
,
user
)
}
let
(
:service
)
{
MergeRequests
::
AddTodoWhenBuildFailsService
.
new
(
project
,
user
)
}
...
...
spec/services/ci/register_job_service_spec.rb
View file @
67c7e0fc
...
@@ -276,6 +276,34 @@ module Ci
...
@@ -276,6 +276,34 @@ module Ci
end
end
end
end
context
'when "dependencies" keyword is specified'
do
let!
(
:pre_stage_job
)
{
create
(
:ci_build
,
:success
,
pipeline:
pipeline
,
name:
job_name
,
stage_idx:
0
)
}
let!
(
:pending_job
)
do
create
(
:ci_build
,
:pending
,
pipeline:
pipeline
,
stage_idx:
1
,
options:
{
dependencies:
[
'spec'
]
}
)
end
let
(
:picked_job
)
{
execute
(
specific_runner
)
}
context
'when a depended job exists'
do
let
(
:job_name
)
{
'spec'
}
it
"picks the build"
do
expect
(
picked_job
).
to
eq
(
pending_job
)
end
end
context
'when depended jobs do not exist'
do
let
(
:job_name
)
{
'robocop'
}
it
'does not pick the build and drops the build'
do
expect
(
picked_job
).
to
be_nil
expect
(
pending_job
.
reload
).
to
be_failed
expect
(
pending_job
).
to
be_missing_dependency_failure
end
end
end
def
execute
(
runner
)
def
execute
(
runner
)
described_class
.
new
(
runner
).
execute
.
build
described_class
.
new
(
runner
).
execute
.
build
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