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
4ab2dd44
Commit
4ab2dd44
authored
Mar 24, 2020
by
Marius Bobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Gitlab::HTTP.try_get to find commit_status from Bamboo CI
parent
dc178732
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
18 deletions
+40
-18
app/models/project_services/bamboo_service.rb
app/models/project_services/bamboo_service.rb
+24
-17
spec/models/project_services/bamboo_service_spec.rb
spec/models/project_services/bamboo_service_spec.rb
+16
-1
No files found.
app/models/project_services/bamboo_service.rb
View file @
4ab2dd44
...
...
@@ -73,7 +73,7 @@ class BambooService < CiService
end
def
calculate_reactive_cache
(
sha
,
ref
)
response
=
get_path
(
"rest/api/latest/result/byChangeset/
#{
sha
}
"
)
response
=
try_
get_path
(
"rest/api/latest/result/byChangeset/
#{
sha
}
"
)
{
build_page:
read_build_page
(
response
),
commit_status:
read_commit_status
(
response
)
}
end
...
...
@@ -81,7 +81,7 @@ class BambooService < CiService
private
def
get_build_result
(
response
)
return
if
response
.
code
!=
200
return
if
response
&
.
code
!=
200
# May be nil if no result, a single result hash, or an array if multiple results for a given changeset.
result
=
response
.
dig
(
'results'
,
'results'
,
'result'
)
...
...
@@ -107,7 +107,7 @@ class BambooService < CiService
end
def
read_commit_status
(
response
)
return
:error
unless
response
.
code
==
200
||
response
.
code
==
404
return
:error
unless
response
&&
(
response
.
code
==
200
||
response
.
code
==
404
)
result
=
get_build_result
(
response
)
status
=
...
...
@@ -130,24 +130,31 @@ class BambooService < CiService
end
end
def
try_get_path
(
path
,
query_params
=
{})
params
=
build_get_params
(
query_params
)
params
[
:extra_log_info
]
=
{
project_id:
project_id
}
Gitlab
::
HTTP
.
try_get
(
build_url
(
path
),
params
)
end
def
get_path
(
path
,
query_params
=
{})
Gitlab
::
HTTP
.
get
(
build_url
(
path
),
build_get_params
(
query_params
))
end
def
build_url
(
path
)
Gitlab
::
Utils
.
append_path
(
bamboo_url
,
path
)
end
def
get_path
(
path
,
query_params
=
{})
url
=
build_url
(
path
)
def
build_get_params
(
query_params
)
params
=
{
verify:
false
,
query:
query_params
}
return
params
if
username
.
blank?
&&
password
.
blank?
if
username
.
blank?
&&
password
.
blank?
Gitlab
::
HTTP
.
get
(
url
,
verify:
false
,
query:
query_params
)
else
query_params
[
:os_authType
]
=
'basic'
Gitlab
::
HTTP
.
get
(
url
,
verify:
false
,
query:
query_params
,
basic_auth:
{
username:
username
,
password:
password
})
end
query_params
[
:os_authType
]
=
'basic'
params
[
:basic_auth
]
=
basic_auth
params
end
def
basic_auth
{
username:
username
,
password:
password
}
end
end
spec/models/project_services/bamboo_service_spec.rb
View file @
4ab2dd44
...
...
@@ -8,9 +8,11 @@ describe BambooService, :use_clean_rails_memory_store_caching do
let
(
:bamboo_url
)
{
'http://gitlab.com/bamboo'
}
let_it_be
(
:project
)
{
create
(
:project
)
}
subject
(
:service
)
do
described_class
.
create
(
project:
create
(
:project
)
,
project:
project
,
properties:
{
bamboo_url:
bamboo_url
,
username:
'mic'
,
...
...
@@ -224,6 +226,19 @@ describe BambooService, :use_clean_rails_memory_store_caching do
is_expected
.
to
eq
(
:error
)
end
Gitlab
::
HTTP
::
HTTP_ERRORS
.
each
do
|
http_error
|
it
"sets commit status to :error with a
#{
http_error
.
name
}
error"
do
WebMock
.
stub_request
(
:get
,
'http://gitlab.com/bamboo/rest/api/latest/result/byChangeset/123?os_authType=basic'
)
.
to_raise
(
http_error
)
expect
(
Gitlab
::
ErrorTracking
)
.
to
receive
(
:log_exception
)
.
with
(
instance_of
(
http_error
),
project_id:
project
.
id
)
is_expected
.
to
eq
(
:error
)
end
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