gitlab-qa 5.4.2 → 5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ce58eec53ccc54effca3fc1b94070e6ec6f930c13e11aef8dafb600c59feb59
-  data.tar.gz: 97437cf5d0bed65931c57af0dc459d6097f37f3787ba8498f9784d4c45158d2a
+  metadata.gz: 5b104344d3af630c69b69edb56915220bacf32e86a2b2d02159bef044112763d
+  data.tar.gz: b98743c7f6c138379c2350e29295c5c0e48b6156319651032c3877d3da0e70d7
 SHA512:
-  metadata.gz: 5ecabb59dd4285a6a0923a680390e6ba7f87eeb85b58827279ebb06870ea32695218ded6a8b78bdaec1d6c4a522d5ed60d888859b6c0dd45c56aa9611a782350
-  data.tar.gz: 46970e6a919d479d104dc664f249b7aa03543e4e95499e7e7912381e02cb383085ea837b61b1e3dfb74eeb6cf50c12ee9ee46e4a5b25a7e4448427fe1bd02622
+  metadata.gz: 35ec93687d9dbbf06c8593b2de3080f2c75fe0f6110f2fa5c1c2b988c5b09efea5562073b38d455480f93172b574bc00fd2cc8a4971a74a76d719c9be43a5eb2
+  data.tar.gz: ad0ad93bbcf79ba906c80b46de51a790459a124460ddeff922bdca63f2aa44b42ca1366ddaab0d471197605519203cbfe177acf939ae8e86d59c9db6a90a21f9

data/lib/gitlab/qa/report/results_in_issues.rb

@@ -27,11 +27,14 @@ module Gitlab
       class ResultsInIssues
         MAINTAINER_ACCESS_LEVEL = 40
         MAX_TITLE_LENGTH = 255
+        RETRY_BACK_OFF_DELAY = 60
+        MAX_RETRY_ATTEMPTS = 3
 
         def initialize(token:, input_files:, project: nil)
           @token = token
           @files = Array(input_files)
           @project = project
+          @retry_backoff = 0
         end
 
         def invoke!
@@ -72,10 +75,12 @@ module Gitlab
         end
 
         def assert_user_permission!
-          user = Gitlab.user
-          member = Gitlab.team_member(project, user.id)
+          handle_gitlab_client_exceptions do
+            user = Gitlab.user
+            member = Gitlab.team_member(project, user.id)
 
-          abort_not_permitted if member.access_level < MAINTAINER_ACCESS_LEVEL
+            abort_not_permitted if member.access_level < MAINTAINER_ACCESS_LEVEL
+          end
         rescue Gitlab::Error::NotFound
           abort_not_permitted
         end
@@ -85,9 +90,11 @@ module Gitlab
         end
 
         def configure_gitlab_client
-          Gitlab.configure do |config|
-            config.endpoint = Runtime::Env.gitlab_api_base
-            config.private_token = token
+          handle_gitlab_client_exceptions do
+            Gitlab.configure do |config|
+              config.endpoint = Runtime::Env.gitlab_api_base
+              config.private_token = token
+            end
           end
         end
 
@@ -113,21 +120,25 @@ module Gitlab
         def create_issue(test)
           puts "Creating issue for file: #{test['file']} | name: #{test['name']}"
 
-          Gitlab.create_issue(
-            project,
-            title_from_test(test),
-            { description: "### Full description\n\n#{search_safe(test['name'])}\n\n### File path\n\n#{test['file']}", labels: 'status::automated' }
-          )
+          handle_gitlab_client_exceptions do
+            Gitlab.create_issue(
+              project,
+              title_from_test(test),
+              { description: "### Full description\n\n#{search_safe(test['name'])}\n\n### File path\n\n#{test['file']}", labels: 'status::automated' }
+            )
+          end
         end
 
         def find_issue(test)
-          issues = Gitlab.issues(project, { search: search_term(test) })
-            .auto_paginate
-            .select { |issue| issue.state == 'opened' && issue.title.strip == title_from_test(test) }
+          handle_gitlab_client_exceptions do
+            issues = Gitlab.issues(project, { search: search_term(test) })
+              .auto_paginate
+              .select { |issue| issue.state == 'opened' && issue.title.strip == title_from_test(test) }
 
-          warn(%(Too many issues found with the file path "#{test['file']}" and name "#{test['name']}")) if issues.many?
+            warn(%(Too many issues found with the file path "#{test['file']}" and name "#{test['name']}")) if issues.many?
 
-          issues.first
+            issues.first
+          end
         end
 
         def search_term(test)
@@ -151,11 +162,13 @@ module Gitlab
 
           note = note_content(test)
 
-          Gitlab.issue_discussions(project, issue.iid, order_by: 'created_at', sort: 'asc').each do |discussion|
-            return add_note_to_discussion(issue.iid, discussion.id) if new_note_matches_discussion?(note, discussion)
-          end
+          handle_gitlab_client_exceptions do
+            Gitlab.issue_discussions(project, issue.iid, order_by: 'created_at', sort: 'asc').each do |discussion|
+              return add_note_to_discussion(issue.iid, discussion.id) if new_note_matches_discussion?(note, discussion)
+            end
 
-          Gitlab.create_issue_note(project, issue.iid, note)
+            Gitlab.create_issue_note(project, issue.iid, note)
+          end
         end
 
         def note_content(test)
@@ -205,7 +218,9 @@ module Gitlab
         end
 
         def add_note_to_discussion(issue_iid, discussion_id)
-          Gitlab.add_note_to_issue_discussion_as_thread(project, issue_iid, discussion_id, body: failure_summary)
+          handle_gitlab_client_exceptions do
+            Gitlab.add_note_to_issue_discussion_as_thread(project, issue_iid, discussion_id, body: failure_summary)
+          end
         end
 
         def update_labels(issue, test)
@@ -214,7 +229,9 @@ module Gitlab
           labels << (failures(test).empty? ? "#{pipeline}::passed" : "#{pipeline}::failed")
           quarantine_job? ? labels << "quarantine" : labels.delete("quarantine")
 
-          Gitlab.edit_issue(project, issue.iid, labels: labels)
+          handle_gitlab_client_exceptions do
+            Gitlab.edit_issue(project, issue.iid, labels: labels)
+          end
         end
 
         def failures(test)
@@ -234,7 +251,47 @@ module Gitlab
           # because the other pipelines will be monitored by the author of the MR that triggered them.
           # So we assume that we're reporting a master pipeline if the project name is 'gitlab-qa'.
 
-          Runtime::Env.ci_project_name.to_s.start_with?('gitlab-qa') ? 'master' : Runtime::Env.ci_project_name
+          Runtime::Env.pipeline_from_project_name
+        end
+
+        def handle_gitlab_client_exceptions
+          yield
+        rescue Gitlab::Error::NotFound
+          # This error could be raised in assert_user_permission!
+          # If so, we want it to terminate at that point
+          raise
+        rescue Errno::ETIMEDOUT, OpenSSL::SSL::SSLError, Net::ReadTimeout => e
+          @retry_backoff += RETRY_BACK_OFF_DELAY
+
+          raise if @retry_backoff > RETRY_BACK_OFF_DELAY * MAX_RETRY_ATTEMPTS
+
+          warn_exception(e)
+          warn("Sleeping for #{@retry_backoff} seconds before retrying...")
+          sleep @retry_backoff
+
+          retry
+        rescue StandardError => e
+          pipeline = QA::Runtime::Env.pipeline_from_project_name
+          channel = pipeline == "canary" ? "qa-production" : "qa-#{pipeline}"
+          error_msg = warn_exception(e)
+          slack_options = {
+            channel: channel,
+            icon_emoji: ':ci_failing:',
+            message: <<~MSG
+              An unexpected error occurred while reporting test results in issues.
+              The error occurred in job: #{QA::Runtime::Env.ci_job_url}
+              `#{error_msg}`
+            MSG
+          }
+          puts "Posting Slack message to channel: #{channel}"
+
+          Gitlab::QA::Slack::PostToSlack.new(**slack_options).invoke!
+        end
+
+        def warn_exception(error)
+          error_msg = "#{error.class.name} #{error.message}"
+          warn(error_msg)
+          error_msg
         end
       end
     end

data/lib/gitlab/qa/runtime/env.rb

@@ -97,6 +97,10 @@ module Gitlab
           ENV['CI_SLACK_WEBHOOK_URL']
         end
 
+        def pipeline_from_project_name
+          ci_project_name.to_s.start_with?('gitlab-qa') ? 'master' : ci_project_name
+        end
+
         def slack_qa_channel
           ENV['SLACK_QA_CHANNEL']
         end

data/lib/gitlab/qa/slack/post_to_slack.rb

@@ -2,23 +2,25 @@ module Gitlab
   module QA
     module Slack
       class PostToSlack
-        def initialize(message:)
+        def initialize(message:, icon_emoji: Runtime::Env.slack_icon_emoji, channel: Runtime::Env.slack_qa_channel)
+          @channel = channel
           @message = message
+          @icon_emoji = icon_emoji
         end
 
         def invoke!
-          Runtime::Env.require_slack_qa_channel!
+          Runtime::Env.require_slack_qa_channel! unless @channel
           Runtime::Env.require_ci_slack_webhook_url!
 
           params = {}
-          params['channel'] = Runtime::Env.slack_qa_channel
+          params['channel'] = @channel
           params['username'] = "GitLab QA Bot"
-          params['icon_emoji'] = Runtime::Env.slack_icon_emoji
+          params['icon_emoji'] = @icon_emoji
           params['text'] = @message
 
           url = Runtime::Env.ci_slack_webhook_url
 
-          Support::HttpRequest.make_http_request(method: 'post', url: url, params: params)
+          Support::HttpRequest.make_http_request(method: 'post', url: url, params: params, show_response: true)
         end
       end
     end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.4.2'.freeze
+    VERSION = '5.4.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.4.3
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control