diff options
author | Nikolay Novikov <nikkes@mail.ru> | 2018-08-02 17:33:26 +0000 |
---|---|---|
committer | Fabio Pitino <fpitino@gitlab.com> | 2019-06-21 15:17:47 +0100 |
commit | 5f1038c8886ceb0e3879f29a074af7d4c6cb6171 (patch) | |
tree | 00e2b484a69f0e20127c095f3cf82dcea15ff14a /app/models/project_services | |
parent | 671d7cdc445b3a4fdbd2295996d149e833d6b6c2 (diff) | |
download | gitlab-ce-5f1038c8886ceb0e3879f29a074af7d4c6cb6171.tar.gz |
Skip TeamCity on branch delete and add MR trigger
This is a take over from a community contribution:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20990
Skip TeamCity push event when related to branch delete
Support merge request events for TeamCity service.
Add checkbox for merge request triggers in the TeamCity
configuration page.
Diffstat (limited to 'app/models/project_services')
-rw-r--r-- | app/models/project_services/teamcity_service.rb | 90 |
1 files changed, 66 insertions, 24 deletions
diff --git a/app/models/project_services/teamcity_service.rb b/app/models/project_services/teamcity_service.rb index 3245cd22e73..918a1b32612 100644 --- a/app/models/project_services/teamcity_service.rb +++ b/app/models/project_services/teamcity_service.rb @@ -19,6 +19,25 @@ class TeamcityService < CiService after_save :compose_service_hook, if: :activated? before_update :reset_password + class << self + def to_param + 'teamcity' + end + + def supported_events + %w(push merge_request) + end + + def event_description(event) + case event + when 'push', 'push_events' + 'TeamCity CI will be triggered after every push to the repository except branch delete' + when 'merge_request', 'merge_request_events' + 'TeamCity CI will be triggered after a merge request has been created or updated' + end + end + end + def compose_service_hook hook = service_hook || build_service_hook hook.save @@ -43,10 +62,6 @@ class TeamcityService < CiService 'requests build, that setting is in the vsc root advanced settings.' end - def self.to_param - 'teamcity' - end - def fields [ { type: 'text', name: 'teamcity_url', @@ -76,21 +91,14 @@ class TeamcityService < CiService def execute(data) return unless supported_events.include?(data[:object_kind]) - auth = { - username: username, - password: password - } - - branch = Gitlab::Git.ref_name(data[:ref]) - - Gitlab::HTTP.post( - build_url('httpAuth/app/rest/buildQueue'), - body: "<build branchName=\"#{branch}\">"\ - "<buildType id=\"#{build_type}\"/>"\ - '</build>', - headers: { 'Content-type' => 'application/xml' }, - basic_auth: auth - ) + case data[:object_kind] + when 'push' + branch = Gitlab::Git.ref_name(data[:ref]) + post_to_build_queue(data, branch) if push_valid?(data) + when 'merge_request' + branch = data[:object_attributes][:source_branch] + post_to_build_queue(data, branch) if merge_request_valid?(data) + end end private @@ -134,10 +142,44 @@ class TeamcityService < CiService end def get_path(path) - Gitlab::HTTP.get(build_url(path), verify: false, - basic_auth: { - username: username, - password: password - }) + Gitlab::HTTP.get(build_url(path), verify: false, basic_auth: basic_auth) + end + + def post_to_build_queue(data, branch) + Gitlab::HTTP.post( + build_url('httpAuth/app/rest/buildQueue'), + body: "<build branchName=#{branch.encode(xml: :attr)}>"\ + "<buildType id=#{build_type.encode(xml: :attr)}/>"\ + '</build>', + headers: { 'Content-type' => 'application/xml' }, + basic_auth: basic_auth + ) + end + + def basic_auth + { username: username, password: password } + end + + def push_valid?(data) + data[:total_commits_count] > 0 && + !branch_removed?(data) && + no_open_merge_requests?(data) + end + + def merge_request_valid?(data) + data.dig(:object_attributes, :state) == 'opened' && + MergeRequest.state_machines[:merge_status].check_state?(data.dig(:object_attributes, :merge_status)) + end + + def branch_removed?(data) + Gitlab::Git.blank_ref?(data[:after]) + end + + def no_open_merge_requests?(data) + !project.merge_requests + .opened + .from_project(project) + .from_source_branches(Gitlab::Git.ref_name(data[:ref])) + .exists? end end |