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
781cd4a2
Commit
781cd4a2
authored
Apr 15, 2019
by
Tiger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rescue and log errors raised when preparing builds
https://gitlab.com/gitlab-org/gitlab-ce/issues/60480
parent
0a99e022
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
4 deletions
+20
-4
app/services/ci/prepare_build_service.rb
app/services/ci/prepare_build_service.rb
+5
-3
spec/services/ci/prepare_build_service_spec.rb
spec/services/ci/prepare_build_service_spec.rb
+15
-1
No files found.
app/services/ci/prepare_build_service.rb
View file @
781cd4a2
...
@@ -11,9 +11,11 @@ module Ci
...
@@ -11,9 +11,11 @@ module Ci
def
execute
def
execute
prerequisites
.
each
(
&
:complete!
)
prerequisites
.
each
(
&
:complete!
)
unless
build
.
enqueue
build
.
enqueue!
build
.
drop!
(
:unmet_prerequisites
)
rescue
=>
e
end
Gitlab
::
Sentry
.
track_acceptable_exception
(
e
,
extra:
{
build_id:
build
.
id
})
build
.
drop
(
:unmet_prerequisites
)
end
end
private
private
...
...
spec/services/ci/prepare_build_service_spec.rb
View file @
781cd4a2
...
@@ -38,7 +38,21 @@ describe Ci::PrepareBuildService do
...
@@ -38,7 +38,21 @@ describe Ci::PrepareBuildService do
end
end
it
'drops the build'
do
it
'drops the build'
do
expect
(
build
).
to
receive
(
:drop!
).
with
(
:unmet_prerequisites
).
once
expect
(
build
).
to
receive
(
:drop
).
with
(
:unmet_prerequisites
).
once
subject
end
end
context
'prerequisites raise an error'
do
before
do
allow
(
prerequisite
).
to
receive
(
:complete!
).
and_raise
Kubeclient
::
HttpError
.
new
(
401
,
'unauthorized'
,
nil
)
end
it
'drops the build and notifies Sentry'
do
expect
(
build
).
to
receive
(
:drop
).
with
(
:unmet_prerequisites
).
once
expect
(
Gitlab
::
Sentry
).
to
receive
(
:track_acceptable_exception
)
.
with
(
instance_of
(
Kubeclient
::
HttpError
),
hash_including
(
extra:
{
build_id:
build
.
id
}))
subject
subject
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