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
df73b90a
Commit
df73b90a
authored
Jan 10, 2019
by
Willi Nesensohn
Committed by
Robert Speicher
Jan 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use revision instead of build number for TC query.
parent
626bd9d4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
app/models/project_services/teamcity_service.rb
app/models/project_services/teamcity_service.rb
+2
-4
changelogs/unreleased/55495-teamcity-use-revision-in-query.yml
...elogs/unreleased/55495-teamcity-use-revision-in-query.yml
+5
-0
spec/models/project_services/teamcity_service_spec.rb
spec/models/project_services/teamcity_service_spec.rb
+1
-1
No files found.
app/models/project_services/teamcity_service.rb
View file @
df73b90a
...
@@ -39,9 +39,7 @@ class TeamcityService < CiService
...
@@ -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
...
@@ -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
...
...
changelogs/unreleased/55495-teamcity-use-revision-in-query.yml
0 → 100644
View file @
df73b90a
---
title
:
Build number does not need to be tweaked anymore for the TeamCity integration to work properly.
merge_request
:
23898
author
:
type
:
changed
spec/models/project_services/teamcity_service_spec.rb
View file @
df73b90a
...
@@ -205,7 +205,7 @@ describe TeamcityService, :use_clean_rails_memory_store_caching do
...
@@ -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"}})
...
...
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