kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'mr-teamcity-use-revision' into 'master'

Browse source 
Use revision instead of build number for TeamCity query.

See merge request gitlab-org/gitlab-ce!23898
This commit is contained in:
Robert Speicher 2019-01-10 16:34:49 +00:00
commit 6a27e01abd
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/project_services/teamcity_service.rb
View file

@ -39,9 +39,7 @@ class TeamcityService < CiService
end end
def help def help
'The build configuration in Teamcity must use the build format '\ 'You will want to configure monitoring of all branches so merge '\
'number %build.vcs.number% '\
'you will also want to configure monitoring of all branches so merge '\
'requests build, that setting is in the vsc root advanced settings.' 'requests build, that setting is in the vsc root advanced settings.'
end end
@ -70,7 +68,7 @@ class TeamcityService < CiService
end end
def calculate_reactive_cache(sha, ref) def calculate_reactive_cache(sha, ref)
response = get_path("httpAuth/app/rest/builds/branch:unspecified:any,number:#{sha}") response = get_path("httpAuth/app/rest/builds/branch:unspecified:any,revision:#{sha}")
{ build_page: read_build_page(response), commit_status: read_commit_status(response) } { build_page: read_build_page(response), commit_status: read_commit_status(response) }
end end

5
changelogs/unreleased/55495-teamcity-use-revision-in-query.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Build number does not need to be tweaked anymore for the TeamCity integration to work properly.
merge_request: 23898
author:
type: changed

2
spec/models/project_services/teamcity_service_spec.rb
View file

@ -205,7 +205,7 @@ describe TeamcityService, :use_clean_rails_memory_store_caching do
end end
def stub_request(status: 200, body: nil, build_status: 'success') def stub_request(status: 200, body: nil, build_status: 'success')
teamcity_full_url = 'http://gitlab.com/teamcity/httpAuth/app/rest/builds/branch:unspecified:any,number:123' teamcity_full_url = 'http://gitlab.com/teamcity/httpAuth/app/rest/builds/branch:unspecified:any,revision:123'
auth = %w(mic password) auth = %w(mic password)
body ||= %Q({"build":{"status":"#{build_status}","id":"666"}}) body ||= %Q({"build":{"status":"#{build_status}","id":"666"}})