dri 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990d9ed4c79b5b7c7ff2e5535dba71599a3189d4c742b918f98d3063a6e15c9f
-  data.tar.gz: 15e48f44496a55d5d13185409a91d9ddd525d127fd8dbe73265dc176c6d14634
+  metadata.gz: 3b4a86b6e658b2426bfce682d92f34f1441a9a1812f0cc805088b8c250991d4d
+  data.tar.gz: 3cf2b62c9aa5b1ef8de5cd51f8fdd927fa5335c9a1299b4947ab162b8afe2526
 SHA512:
-  metadata.gz: 22a9838a3821c90cb24346f6f98b6158e2a71ec9bd0c4e7b5d9e447a75b676202be1d365e1603d7d12a8441f6b5d448f26337c33163b60f346819933da24fea3
-  data.tar.gz: 6b117a44436b2c4c064c3b19b22deb454a42c8d6d460492af7813e72299600d50ad2cef612e5e1f2a84566588f560d31c82da3c5c92b35f1d8749ea445e9664e
+  metadata.gz: 4d79cdc2db7e1f959fee5b80988516677455a1d18e151a300923b2d19a58f0bb4fc4342db5e3785c34b5ef4475655b37cb10ad8850e488429ab12cfd8ad03fb8
+  data.tar.gz: 5120e934a2e8a45a51b4328bf5a1ae3af1a55b19e42023e538f65c958bfad0a8810f89844b7f2ef40608d0c7233d64f652ba9f101cff37f203a900d940084771

data/.gitlab-ci.yml

@@ -15,12 +15,12 @@
       - vendor/bundle
     policy: pull
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
 
 include:
   - project: gitlab-org/quality/pipeline-common
-    ref: 0.15.1
+    ref: 1.2.3
     file:
       - /ci/gem-release.yml
       - /ci/ref-update.gitlab-ci.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dri (0.6.1)
+    dri (0.8.0)
       amatch (~> 0.4.1)
       gitlab (~> 4.18)
       httparty (~> 0.20.0)

data/README.md

@@ -146,6 +146,7 @@ $ dri publish report
 ```
 
 Publishes a handover report on the latest triage issue, in the [pipeline-triage](https://gitlab.com/gitlab-org/quality/pipeline-triage) project.
+The report includes automatically both triaged failures and incidents.
 
 **Options**
 
@@ -155,12 +156,13 @@ $ dri publish report --format=table # formats the report in a table (default)
 $ dri publish report --dry-run # the report is only generated locally
 $ dri publish report --actions # activate the actions prompt for each failure
 $ dri publish report --feature-flags # includes a summary of the feature flag changes on each environment
+$ dri publish report --update # update the report note if has already been posted
 ```
 
 **Note:** These options above can be combined like:
 
 ```shell
-$ dri publish report --format=list --dry-run --actions
+$ dri publish report --format=list --dry-run --actions --update
 ```
 
 **Actions**

data/lib/dri/api_client.rb

@@ -6,16 +6,17 @@ require "tty-config"
 require "cgi"
 require "gitlab"
 
+require_relative './utils/constants'
+
 module Dri
   TokenNotProvidedError = Class.new(StandardError)
   class ApiClient # rubocop:disable Metrics/ClassLength
+    include Dri::Utils::Constants::ProjectIDs
+    include Dri::Utils::Constants::Triage::Labels
+
     API_URL                     = "https://gitlab.com/api/v4"
     OPS_API_URL                 = "https://ops.gitlab.net/api/v4"
-    TESTCASES_PROJECT_ID        = "11229385"
-    TRIAGE_PROJECT_ID           = "15291320"
-    GITLAB_PROJECT_ID           = "278964"
-    FEATURE_FLAG_LOG_PROJECT_ID = "15208716"
-    INFRA_TEAM_PROD_PROJECT_ID  = "7444821"
+
     def initialize(config, ops = false)
       @token = config.read.dig("settings", "token")
       @ops_token = config.read.dig("settings", "ops_token")
@@ -27,14 +28,31 @@ module Dri
       @ops_instance = ops
     end
 
-    # Fetch triaged failures
+    # Fetch all triaged failures
     #
     # @param [String] emoji
     # @param [String] state
-    # @return [Gitlab::ObjectifiedHash]
-    def fetch_triaged_failures(emoji:, state:)
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def fetch_all_triaged_failures(emoji:, state:)
+      project_ids = [GITLAB_PROJECT_ID, CUSTOMERSDOT_PROJECT_ID]
+      failures = []
+
+      project_ids.each do |project_id|
+        failures += fetch_triaged_failures(project_id: project_id, emoji: emoji, state: state)
+      end
+
+      failures
+    end
+
+    # Fetch triaged failures for a given project
+    #
+    # @param [Integer] project_id
+    # @param [String] emoji
+    # @param [String] state
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def fetch_triaged_failures(project_id:, emoji:, state:)
       gitlab.issues(
-        GITLAB_PROJECT_ID,
+        project_id,
         order_by: "updated_at",
         my_reaction_emoji: emoji,
         scope: "all",
@@ -42,12 +60,26 @@ module Dri
       )
     end
 
+    # Fetch triaged incidents
+    #
+    # @param [String] emoji
+    def fetch_triaged_incidents(emoji:)
+      gitlab.issues(
+        INFRA_TEAM_PROD_PROJECT_ID,
+        order_by: "updated_at",
+        my_reaction_emoji: emoji,
+        state: "all",
+        labels: "incident"
+      )
+    end
+
     # Fetch award emojis
     #
     # @param [Integer] issue_iid
+    # @param [Integer] project_id
     # @return [Array<Gitlab::ObjectifiedHash>]
-    def fetch_awarded_emojis(issue_iid)
-      gitlab.award_emojis(GITLAB_PROJECT_ID, issue_iid, "issue")
+    def fetch_awarded_emojis(issue_iid, project_id:)
+      gitlab.award_emojis(project_id, issue_iid, "issue")
     end
 
     # Fetch failing testcases
@@ -61,14 +93,14 @@ module Dri
         labels: "#{pipeline}::failed",
         state: state,
         scope: "all",
-        "not[labels]": "quarantine"
+        "not[labels]": QUARANTINE
       ).auto_paginate
     end
 
     # Fetch issues related to failing test cases
     #
     # @return [Array<Gitlab::ObjectifiedHash>]
-    def fetch_test_failure_issues(labels: 'failure::new')
+    def fetch_test_failure_issues(labels: FAILURE_NEW)
       gitlab.issues(
         GITLAB_PROJECT_ID,
         labels: labels,
@@ -79,10 +111,11 @@ module Dri
 
     # Fetch related issue mrs
     #
+    # @param [Integer] project_id
     # @param [Integer] issue_iid
     # @return [Array<Gitlab::ObjectifiedHash>]
-    def fetch_related_mrs(issue_iid)
-      gitlab.related_issue_merge_requests(GITLAB_PROJECT_ID, issue_iid)
+    def fetch_related_mrs(project_id, issue_iid)
+      gitlab.related_issue_merge_requests(project_id, issue_iid)
     end
 
     # Fetch MRs
@@ -115,15 +148,42 @@ module Dri
       gitlab.create_issue_note(TRIAGE_PROJECT_ID, iid, body)
     end
 
-    # Fetch new failures
+    # Update triage report note
+    #
+    # @param [Integer] iid
+    # @param [Integer] note_id
+    # @param [String] body
+    # @return [Gitlab::ObjectifiedHash]
+    def update_triage_report_note(iid:, note_id:, body:)
+      gitlab.edit_issue_note(TRIAGE_PROJECT_ID, iid, note_id, body)
+    end
+
+    # Fetch all new failures
     #
     # @param [String] date
     # @param [String] state
     # @return [Array<Gitlab::ObjectifiedHash>]
-    def fetch_failures(date:, state:)
+    def fetch_all_new_failures(date:, state:)
+      project_ids = [GITLAB_PROJECT_ID, CUSTOMERSDOT_PROJECT_ID]
+      failures = []
+
+      project_ids.each do |project_id|
+        failures += fetch_new_failures(project_id: project_id, date: date, state: state)
+      end
+
+      failures
+    end
+
+    # Fetch new failures for a given project
+    #
+    # @param [Integer] project_id
+    # @param [String] date
+    # @param [String] state
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def fetch_new_failures(project_id:, date:, state:)
       gitlab.issues(
-        GITLAB_PROJECT_ID,
-        labels: "failure::new",
+        project_id,
+        labels: FAILURE_NEW,
         order_by: "updated_at",
         state: state,
         scope: "all",
@@ -134,20 +194,22 @@ module Dri
 
     # Fetch failure notes
     #
+    # @param [Integer] project_id
     # @param [Integer] issue_iid
     # @return [Array<Gitlab::ObjectifiedHash>]
-    def fetch_failure_notes(issue_iid)
-      gitlab.issue_notes(GITLAB_PROJECT_ID, issue_iid, per_page: 100).auto_paginate
+    def fetch_failure_notes(project_id, issue_iid)
+      gitlab.issue_notes(project_id, issue_iid, per_page: 100).auto_paginate
     end
 
     # Delete award emoji
     #
     # @param [Integer] issue_iid
     # @param [Integer] emoji_id
+    # @param [Integer] project_id
     # @return [Gitlab::ObjectifiedHash]
-    def delete_award_emoji(issue_iid, emoji_id)
+    def delete_award_emoji(issue_iid, emoji_id:, project_id: GITLAB_PROJECT_ID)
       gitlab.delete_award_emoji(
-        GITLAB_PROJECT_ID,
+        project_id,
         issue_iid,
         "issue",
         emoji_id

data/lib/dri/command.rb

@@ -60,6 +60,10 @@ module Dri
       @timezone ||= profile["settings"]["timezone"]
     end
 
+    def handover_report_path
+      @handover_report_path ||= profile["settings"]["handover_report_path"]
+    end
+
     def verify_config_exists
       return if config.exist?
 

data/lib/dri/commands/analyze/stack_traces.rb

@@ -2,6 +2,7 @@
 
 require_relative '../../command'
 require_relative '../../utils/table'
+require_relative '../../utils/constants'
 require 'amatch'
 require 'fileutils'
 
@@ -11,10 +12,11 @@ module Dri
       class StackTraces < Dri::Command
         include Amatch
         include Dri::Utils::Table
+        include Dri::Utils::Constants::Triage::Labels
 
         def initialize(options)
           @options = options
-          @labels = options[:labels] || 'failure::new'
+          @labels = options[:labels] || FAILURE_NEW
           @similarity_score_threshold = options[:similarity_score_threshold] || 0.9
         end
 
@@ -29,7 +31,7 @@ module Dri
             logger.info "#{Time.now.utc} API response completed"
 
             if response.empty?
-              logger.info 'There are no failure::new issues identified!'
+              logger.info "There are no #{FAILURE_NEW} issues identified!"
               exit 0
             end
 

data/lib/dri/commands/fetch/failures.rb

@@ -2,12 +2,14 @@
 
 require_relative '../../command'
 require_relative '../../utils/table'
+require_relative '../../utils/constants'
 
 module Dri
   module Commands
     class Fetch
       class Failures < Dri::Command
         include Dri::Utils::Table
+        include Dri::Utils::Constants::Triage::Labels
         using Refinements
 
         SORT_BY_OPTIONS = {
@@ -34,33 +36,34 @@ module Dri
           author = add_color('Author', :bright_yellow)
           url = add_color('URL', :bright_yellow)
 
-          failures = []
+          sorted_failures = []
           labels = [title, triaged, environment, author, url]
           triaged_counter = 0
 
           logger.info "Fetching today's failures..."
 
           spinner.run do # rubocop:disable Metrics/BlockLength
-            response = api_client.fetch_failures(date: @today_iso_format, state: 'opened')
+            failures = api_client.fetch_all_new_failures(date: @today_iso_format, state: 'opened')
 
-            if response.empty?
+            if failures.empty?
               logger.info 'Life is great, there are no new failures today!'
               exit 0
             end
 
-            response.each do |failure|
+            failures.each do |failure|
+              project_id = failure.project_id
               title = failure.title.truncate(60)
               author = failure.to_h.dig('author', 'username')
               url = failure.web_url
               triaged = add_color('x', :red)
-              envs = failure.labels.select { |l| l.include?('found:') }.map do |l|
+              envs = failure.labels.select { |l| l.include?(FOUND) }.map do |l|
                 env = l.split(':').last.gsub('.gitlab.com', '')
 
                 env == 'gitlab.com' ? 'production' : env
               end
               urgent = urgent_environments.all? { |env| envs.include?(env) }
 
-              emoji_awards = api_client.fetch_awarded_emojis(failure.iid).find do |e|
+              emoji_awards = api_client.fetch_awarded_emojis(failure.iid, project_id: project_id).find do |e|
                 e.name == emoji && e.to_h.dig('user', 'username') == username
               end
 
@@ -70,26 +73,26 @@ module Dri
               end
 
               if @options[:urgent]
-                failures << [title, triaged, envs.first, author, url] if urgent
+                sorted_failures << [title, triaged, envs.first, author, url] if urgent
               else
-                failures << [title, triaged, envs.first, author, url]
+                sorted_failures << [title, triaged, envs.first, author, url]
               end
             end
 
-            failures.sort_by! { |failure| failure[SORT_BY_OPTIONS[@options[:sort_by]&.to_sym || :environment]] }
+            sorted_failures.sort_by! { |failure| failure[SORT_BY_OPTIONS[@options[:sort_by]&.to_sym || :environment]] }
           end
 
           msg = if @options[:urgent]
                   <<~MSG
-                    Found: #{failures.size} urgent failures, occurring in both canary.gitlab.com and canary.staging.gitlab.com.
+                    Found: #{sorted_failures.size} urgent failures, occurring in both canary.gitlab.com and canary.staging.gitlab.com.
                   MSG
                 else
                   <<~MSG
-                    Found: #{failures.size} failures, of these #{triaged_counter} have been triaged with a #{emoji}.
+                    Found: #{sorted_failures.size} failures, of these #{triaged_counter} have been triaged with a #{emoji}.
                   MSG
                 end
 
-          print_table(labels, failures, alignments: [:left, :center, :center, :left])
+          print_table(labels, sorted_failures, alignments: [:left, :center, :center, :left])
           output.puts(msg)
         end
       end

data/lib/dri/commands/fetch/featureflags.rb

@@ -2,7 +2,7 @@
 
 require_relative '../../command'
 require_relative '../../utils/table'
-require_relative '../../utils/feature_flag_consts'
+require_relative '../../utils/constants'
 require_relative '../../feature_flag_report'
 
 module Dri
@@ -10,7 +10,7 @@ module Dri
     class Fetch
       class FeatureFlags < Dri::Command
         include Dri::Utils::Table
-        include Dri::Utils::FeatureFlagConsts
+        include Dri::Utils::Constants::FeatureFlag
 
         def initialize(options)
           @options = options

data/lib/dri/commands/fetch/pipelines.rb

@@ -10,6 +10,7 @@ module Dri
     class Fetch
       class Pipelines < Dri::Command # rubocop:disable Metrics/ClassLength
         include Dri::Utils::Table
+        include Dri::Utils::Constants
         using Refinements
 
         NUM_OF_TESTS_LIVE_ENV = 1000
@@ -27,7 +28,7 @@ module Dri
           table_labels = define_table_labels
 
           spinner.run do
-            Dri::Utils::Constants::PIPELINE_ENVIRONMENTS.each do |environment, details|
+            PIPELINE_ENVIRONMENTS.each do |environment, details|
               logger.info "Fetching last executed #{environment} pipeline"
               pipelines << fetch_pipeline(pipeline_name: environment.to_s, details: details)
               logger.info "Fetching complete for #{environment} ✓"
@@ -61,7 +62,7 @@ module Dri
           bridges = api_client.pipeline_bridges(project_id, pipeline_id)
           return if bridges.empty? # If downstream pipeline doesn't exist, which triggers the QA tests, return
 
-          bridges.first["downstream_pipeline"]
+          bridges.find { |it| it.name == "e2e:package-and-test" }&.downstream_pipeline
         end
 
         # Get jobs from a pipeline
@@ -136,6 +137,14 @@ module Dri
                              pipeline_id: pipeline.id, ops: ops)
         end
 
+        # Master pipeline run
+        #
+        # @param [String] pipeline_name
+        # @return [Boolean]
+        def master?(pipeline_name)
+          pipeline_name == "master"
+        end
+
         # Constructs allure report url for each pipeline
         # @param [String] pipeline_name
         # @param [Integer] pipeline_id
@@ -151,7 +160,7 @@ module Dri
         def allure_bucket_name(pipeline_name, sanity)
           case pipeline_name
           when "master"
-            "package-and-qa"
+            "e2e-package-and-test"
           when "nightly"
             pipeline_name
           when "pre_prod"
@@ -182,16 +191,19 @@ module Dri
           url.include?("ops.gitlab.net")
         end
 
-        def notify_slack_job_name(pipeline_name, ops)
-          return "notify-slack-qa-fail" if ops
-
-          pipeline_name.to_s.include?("master") ? "notify_slack" : "notify-slack-fail"
+        # Slack notification job name
+        #
+        # @param [Boolean] ops
+        # @return [String]
+        def notify_job_name(ops)
+          ops ? "notify-slack-qa-fail" : "notify-slack-fail"
         end
 
         # Returns child pipeline if it is master pipeline
+        # @param [String] pipeline_name
         # @param [Gitlab::ObjectifiedHash] pipeline
-        def pipeline_with_qa_tests(pipeline)
-          if pipeline.web_url.to_s.include?("gitlab-qa-mirror")
+        def pipeline_with_qa_tests(pipeline_name, pipeline)
+          if master?(pipeline_name)
             bridge_pipeline(pipeline.project_id, pipeline.id)
           else
             pipeline
@@ -202,9 +214,13 @@ module Dri
         # @param [Hash] details
         # @param [Boolean] ops
         def options(details, ops)
-          options = { order_by: "updated_at", scope: "finished",
-                      updated_after: past_timestamp(details[:search_hours_ago]) }
-          options.merge(username: "gitlab-bot") if ops
+          options = {
+            order_by: "updated_at",
+            scope: "finished",
+            ref: "master",
+            updated_after: past_timestamp(details[:search_hours_ago])
+          }
+          options.merge(username: "gitlab-bot") if ops || master?(details[:name])
           options
         end
 
@@ -218,7 +234,7 @@ module Dri
         # @param [Hash] details Pipeline environment details
         # @return [Array] Array of last executed pipeline details
         # rubocop:disable Metrics/PerceivedComplexity
-        def fetch_pipeline(pipeline_name:, details:) # rubocop:disable Metrics/CyclomaticComplexity
+        def fetch_pipeline(pipeline_name:, details:) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
           ops = ops_pipeline?(details[:url])
           options = options(details, ops)
           # instance is ops.gitlab.net or gitlab.com
@@ -228,18 +244,15 @@ module Dri
 
           # Return empty data to the table if no matching pipelines were found from the query
           response.each do |pipeline|
-            pipeline_to_scan = pipeline_with_qa_tests(pipeline) # Fetch child pipeline if it is master
+            pipeline_to_scan = pipeline_with_qa_tests(pipeline_name, pipeline) # Fetch child pipeline if it is master
             next if pipeline_to_scan.nil?
 
             pipeline_jobs = jobs(project_id: pipeline.project_id, pipeline_id: pipeline_to_scan.id, ops: ops)
-            next unless contains_job?(pipeline_jobs, job_name: notify_slack_job_name(pipeline_name, ops))
+            next unless master?(pipeline_name) || contains_job?(pipeline_jobs, job_name: notify_job_name(ops))
 
             # Need to know if it is a sanity or a full run to construct allure report url
-            sanity = sanity?(pipeline_jobs: pipeline_jobs, pipeline: pipeline_to_scan,
-                             ops: ops)
-
+            sanity = sanity?(pipeline_jobs: pipeline_jobs, pipeline: pipeline_to_scan, ops: ops)
             next if sanity.nil? # To filter out some "clean up" pipelines present in live environments
-
             next if sanity && @options[:full_runs_only] # Filter out sanity runs if --full-runs-only option is passed
 
             name = ops ? "#{pipeline_name}_#{run_type(sanity)}" : pipeline_name

data/lib/dri/commands/fetch/quarantines.rb

@@ -2,12 +2,14 @@
 
 require_relative '../../command'
 require_relative '../../utils/table'
+require_relative '../../utils/constants'
 
 module Dri
   module Commands
     class Fetch
       class Quarantines < Dri::Command
         include Dri::Utils::Table
+        include Dri::Utils::Constants::Triage::Labels
         using Refinements
 
         def initialize(options, search: '[QUARANTINE]')
@@ -30,7 +32,7 @@ module Dri
           spinner.run do
             response = api_client.fetch_mrs(
               project_id: 'gitlab-org/gitlab',
-              labels: 'QA,Quality',
+              labels: "#{QA},#{QUALITY}",
               search: @search,
               in: :title,
               state: :opened

data/lib/dri/commands/fetch/triaged.rb

@@ -2,12 +2,14 @@
 
 require_relative '../../command'
 require_relative '../../utils/table'
+require_relative '../../utils/constants'
 
 module Dri
   module Commands
     class Fetch
       class Triaged < Dri::Command
         include Dri::Utils::Table
+        include Dri::Utils::Constants::Triage::Labels
         using Refinements
 
         def initialize(options)
@@ -27,21 +29,21 @@ module Dri
           logger.info "Fetching your triaged failures..."
           spinner.start
 
-          response = api_client.fetch_triaged_failures(emoji: emoji, state: 'opened')
+          failures = api_client.fetch_all_triaged_failures(emoji: emoji, state: 'opened')
 
-          if response.empty?
+          if failures.empty?
             logger.info "There are no failures triaged yet with #{add_color(emoji, :black, :on_white)}."
             exit 0
           end
 
-          response.each do |triaged|
+          failures.each do |triaged|
             title = triaged["title"].truncate(70)
             url = triaged["web_url"]
             labels = triaged["labels"]
             type = ""
 
             labels.each do |label|
-              type = label.gsub!('failure::', ' ').to_s if label.include? "failure::"
+              type = label.gsub!(FAILURE, ' ').to_s if label.include? FAILURE
             end
 
             failures_triaged << [title, url, type]

data/lib/dri/commands/fetch.rb

@@ -19,7 +19,7 @@ module Dri
         end
       end
 
-      desc 'triaged', 'Command description...'
+      desc 'triaged', 'Display triaged failures'
       method_option :help, aliases: '-h', type: :boolean,
                            desc: 'Display usage information'
       def triaged(*)

data/lib/dri/commands/incidents.rb

@@ -2,11 +2,13 @@
 
 require_relative '../command'
 require_relative '../utils/table'
+require_relative '../utils/constants'
 
 module Dri
   module Commands
     class Incidents < Dri::Command
       include Dri::Utils::Table
+      include Dri::Utils::Constants::Triage::Labels
       using Refinements
 
       def initialize(options)
@@ -42,8 +44,8 @@ module Dri
             service = "N/A"
 
             labels.each do |label|
-              status = label.gsub!('Incident::', ' ').to_s if label.include? "Incident::"
-              service = label.gsub!('Service::', ' ').to_s if label.include? "Service::"
+              status = label.gsub!(INCIDENT, ' ').to_s if label.include? INCIDENT
+              service = label.gsub!(SERVICE, ' ').to_s if label.include? SERVICE
             end
 
             incidents << [title, service, status, url]

data/lib/dri/commands/init.rb

@@ -34,6 +34,8 @@ module Dri
         @ops_token = prompt.mask("Please provide your ops.gitlab.net personal access token:")
         @timezone = prompt.select("Choose your current timezone?", %w[EMEA AMER APAC])
         @emoji = prompt.ask("Have a triage emoji?")
+        @handover_report_path = prompt.ask("Please provide a path for handover report",
+                                           default: "#{Dir.pwd}/handover_reports")
 
         if (@emoji || @token || @username || @ops_token).nil?
           logger.error "Please provide a username, gitlab token, ops token, timezone and emoji used for triage."
@@ -45,6 +47,7 @@ module Dri
         config.set(:settings, :ops_token, value: @ops_token)
         config.set(:settings, :timezone, value: @timezone)
         config.set(:settings, :emoji, value: @emoji)
+        config.set(:settings, :handover_report_path, value: @handover_report_path)
         config.write(force: true)
 
         logger.success "✅ We're ready to go 🚀"

data/lib/dri/commands/publish/report.rb

@@ -2,7 +2,7 @@
 
 require_relative '../../command'
 require_relative '../../utils/markdown_lists'
-require_relative '../../utils/feature_flag_consts'
+require_relative '../../utils/constants'
 require_relative '../../report'
 require_relative '../../feature_flag_report'
 
@@ -14,7 +14,7 @@ module Dri
   module Commands
     class Publish
       class Report < Dri::Command # rubocop:disable Metrics/ClassLength
-        include Dri::Utils::FeatureFlagConsts
+        include Dri::Utils::Constants::FeatureFlag
 
         def initialize(options)
           @options = options
@@ -28,20 +28,21 @@ module Dri
           verify_config_exists
           report = Dri::Report.new(config)
 
-          logger.info "Fetching triaged failures with award emoji #{emoji}..."
+          logger.info "Fetching triaged failures and incidents with award emoji #{emoji}..."
 
           spinner.start
 
-          issues = api_client.fetch_triaged_failures(emoji: emoji, state: 'opened')
+          failures = api_client.fetch_all_triaged_failures(emoji: emoji, state: 'opened')
+          incidents = api_client.fetch_triaged_incidents(emoji: emoji)
 
           spinner.stop
 
-          if issues.empty?
-            logger.warn "Found no issues associated with \"#{emoji}\" emoji. Will exit. Bye 👋"
+          if failures.empty? && incidents.empty?
+            logger.warn "Found no failures nor incidents associated with \"#{emoji}\" emoji. Will exit. Bye 👋"
             exit 1
           end
 
-          logger.info 'Assembling the failures report... '
+          logger.info 'Assembling the handover report... '
           # sets each failure on the table
           action_options = [
             'pinged SET',
@@ -57,32 +58,52 @@ module Dri
 
           spinner.start
 
-          issues.each do |issue|
+          failures.each do |failure|
             actions = []
 
             if @options[:actions]
               actions = prompt.multi_select(
-                "Please mark the actions on #{add_color(issue.title, :yellow)}: ",
+                "Please mark the actions on #{add_color(failure.title, :yellow)}: ",
                 action_options,
                 per_page: 9
               )
             end
 
-            report.add_failure(issue, actions)
+            report.add_failure(failure, actions)
+          end
+
+          unless incidents.empty?
+            incidents.each do |issue|
+              report.add_incident(issue)
+            end
           end
 
           if @options[:format] == 'list'
             # generates markdown list with failures
-            format_style = Utils::MarkdownLists.make_list(report.labels, report.failures) unless report.failures.empty?
+            unless report.failures.empty?
+              failure_report = Utils::MarkdownLists.make_list(report.labels, report.failures)
+            end
+            # generates markdown list with incidents
+            unless report.incidents.empty?
+              incidents_report = Utils::MarkdownLists.make_list(report.labels_incidents, report.incidents)
+            end
           else
             # generates markdown table with rows as failures
             unless report.failures.empty?
-              format_style = MarkdownTables.make_table(
+              failure_report = MarkdownTables.make_table(
                 report.labels,
                 report.failures,
                 is_rows: true, align: %w[l l l l l]
               )
             end
+            # generates markdown table with rows as incidents
+            unless report.incidents.empty?
+              incidents_report = MarkdownTables.make_table(
+                report.labels_incidents,
+                report.incidents,
+                is_rows: true, align: %w[l l l l]
+              )
+            end
           end
 
           spinner.stop
@@ -131,7 +152,7 @@ module Dri
           end
 
           report.set_header(timezone, username)
-          note = "#{report.header}\n\n#{format_style}"
+          note = "#{report.header}\n\n#{failure_report}\n\n#{incidents_report}"
 
           note += feature_flag_note if @options[:feature_flags]
 
@@ -141,8 +162,8 @@ module Dri
 
             spinner.start
 
-            FileUtils.mkdir_p("#{Dir.pwd}/handover_reports")
-            report_path = "handover_reports/report-#{@date}-#{@time}.md"
+            FileUtils.mkdir_p(handover_report_path)
+            report_path = "#{handover_report_path.chomp('/')}/report-#{@date}-#{@time}.md"
 
             File.open(report_path, 'a') do |out_file|
               out_file.puts note
@@ -159,11 +180,29 @@ module Dri
           issues = api_client.fetch_current_triage_issue
           current_issue_iid = issues.first.iid
 
-          api_client.post_triage_report_note(iid: current_issue_iid, body: note)
+          note_action = 'posted'
+          posted_note = nil
+          if @options[:update]
+            report_file = File.read("handover_reports/.tmp/report-#{@date}.json")
+            report_json = JSON.parse(report_file) if report_file
+            posted_note = api_client.update_triage_report_note(
+              iid: current_issue_iid, note_id: report_json['id'], body: note
+            )
+            note_action = 'updated'
+          else
+            posted_note = api_client.post_triage_report_note(iid: current_issue_iid, body: note)
+
+            FileUtils.mkdir_p("#{Dir.pwd}/handover_reports/.tmp")
+            report_path = "handover_reports/.tmp/report-#{@date}.json"
+
+            File.open(report_path, 'w') do |out_file|
+              out_file.write(posted_note.to_h.to_json)
+            end
+          end
 
           output.puts "Done! ✅\n"
           logger.success(<<~MSG)
-            Thanks @#{username}, your report was posted at https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues/#{current_issue_iid} 🎉
+            Thanks @#{username}, your report was #{note_action} at https://gitlab.com/gitlab-org/quality/pipeline-triage/-/issues/#{current_issue_iid}#note_#{posted_note.id} 🎉
           MSG
         end
 

data/lib/dri/commands/publish.rb

@@ -16,6 +16,9 @@ module Dri
                               desc: 'Updates actions on failures'
       method_option :feature_flags, type: :boolean,
                                     desc: 'Adds summary of feature flag changes'
+      method_option :update, aliases: '-u', type: :boolean,
+                             desc: 'Updates an existing report'
+
       def report(*)
         if options[:help]
           invoke :help, ['report']

data/lib/dri/commands/rm/emoji.rb

@@ -20,25 +20,35 @@ module Dri
             exit 0
           end
 
-          logger.info "Removing #{emoji} from issues..."
+          logger.info "Removing #{emoji} emoji from issues..."
 
           spinner.start
 
-          issues_with_award_emoji = api_client.fetch_triaged_failures(emoji: emoji, state: 'opened')
+          failures_with_award_emoji = api_client.fetch_all_triaged_failures(emoji: emoji, state: 'opened')
+          incidents_with_award_emoji = api_client.fetch_triaged_incidents(emoji: emoji)
+
+          issues_with_award_emoji = failures_with_award_emoji + incidents_with_award_emoji
 
           spinner.stop
 
+          cleared_issues_counter = 0
           issues_with_award_emoji.each do |issue|
-            logger.info "Removing #{emoji} from #{issue.web_url}..."
-
-            response = api_client.fetch_awarded_emojis(issue.iid)
+            logger.info "Removing #{emoji} emoji from #{issue.web_url}"
 
+            response = api_client.fetch_awarded_emojis(issue.iid, project_id: issue.project_id)
             emoji_found = response.find { |e| e.name == emoji && e.to_h.dig('user', 'username') == username }
 
-            api_client.delete_award_emoji(issue.iid, emoji_found.id) unless emoji_found.nil?
+            if emoji_found.nil?
+              logger.error "Emoji #{add_color(emoji, :red)} not found for username: #{add_color(username, :red)}"
+              next
+            else
+              api_client.delete_award_emoji(issue.iid, emoji_id: emoji_found.id, project_id: issue.project_id)
+              cleared_issues_counter += 1
+            end
           end
+
           output.puts "Done! ✅"
-          logger.success "Removed #{emoji} from #{issues_with_award_emoji.size} issue(s)."
+          logger.success "Removed #{emoji} from #{cleared_issues_counter} issue(s)."
         end
       end
     end

data/lib/dri/commands/rm/reports.rb

@@ -12,7 +12,7 @@ module Dri
         end
 
         def execute(input: $stdin, output: $stdout)
-          FileUtils.rm_rf("#{Dir.pwd}/handover_reports")
+          FileUtils.rm_rf(handover_report_path) if prompt.yes?("Remove everything in #{handover_report_path}?")
         end
       end
     end

data/lib/dri/feature_flag_report.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './utils/feature_flag_consts'
+require_relative './utils/constants'
 
 module Dri
   class FeatureFlagReport
-    include Dri::Utils::FeatureFlagConsts
+    include Dri::Utils::Constants::FeatureFlag::Labels
 
     attr_reader :header, :labels, :prod, :staging, :staging_ref, :preprod
 

data/lib/dri/report.rb

@@ -1,14 +1,19 @@
 # frozen_string_literal: true
 
+require_relative './utils/constants'
+
 module Dri
   class Report # rubocop:disable Metrics/ClassLength
+    include Dri::Utils::Constants::Triage::Labels
     using Refinements
 
-    attr_reader :header, :failures, :labels
+    attr_reader :header, :failures, :labels, :labels_incidents, :incidents
 
     def initialize(config)
       @labels = ['Title', 'Issue', 'Pipelines', 'Stack Trace', 'Actions']
+      @labels_incidents = %w[Incident Service Status URL]
       @failures = []
+      @incidents = []
       @date = Date.today
       @today = Date.today.strftime("%Y-%m-%d")
       @weekday = Date.today.strftime("%A")
@@ -21,17 +26,31 @@ module Dri
       @header = "# #{timezone}, #{@weekday} - #{@date}\n posted by: @#{username}"
     end
 
+    def add_incident(incident)
+      title = incident["title"]
+      url = incident["web_url"]
+      labels = incident["labels"]
+      status = 'N/A'
+      service = 'N/A'
+
+      labels.each do |label|
+        status = label.gsub!(INCIDENT, ' ').to_s if label.include? INCIDENT
+        service = label.gsub!(SERVICE, ' ').to_s if label.include? SERVICE
+      end
+
+      @incidents << [title, service, status, url]
+    end
+
     def add_failure(failure, actions_opts = [])
+      project_id = failure["project_id"]
       iid = failure["iid"]
       title = format_title(failure["title"])
       link = failure["web_url"]
       labels = failure["labels"]
-      created_at = failure["created_at"]
-      assignees = failure["assignees"]
       description = failure["description"]
 
-      related_mrs = @api_client.fetch_related_mrs(iid)
-      emoji = classify_failure_emoji(created_at)
+      related_mrs = @api_client.fetch_related_mrs(project_id, iid)
+      emoji = classify_failure_emoji(failure["created_at"])
       emojified_link = "#{emoji} #{link}"
 
       stack_blob = if description.empty?
@@ -43,10 +62,10 @@ module Dri
       stack_trace = ":link:[`#{stack_blob}...`](#{link}#stack-trace)"
 
       failure_type = filter_failure_type_labels(labels)
-      assigned_status = assigned?(assignees)
+      assigned_status = assigned?(failure["assignees"])
       pipelines = filter_pipeline_labels(labels)
 
-      linked_pipelines = link_pipelines(iid, pipelines, description)
+      linked_pipelines = link_pipelines(project_id, iid, pipelines, description)
 
       actions_status = actions_status_template(failure_type, assigned_status, actions_opts)
       actions_fixes = actions_fixes_template(related_mrs)
@@ -56,7 +75,7 @@ module Dri
 
     private
 
-    def link_pipelines(iid, pipelines, description) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+    def link_pipelines(project_id, iid, pipelines, description) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
       linked = []
       label_pipeline_map = {
         'gitlab.com' => '/quality/production',
@@ -71,7 +90,7 @@ module Dri
         'release' => '/quality/release'
       }
 
-      failure_notes = @api_client.fetch_failure_notes(iid)
+      failure_notes = @api_client.fetch_failure_notes(project_id, iid)
 
       return if pipelines.empty?
 
@@ -156,10 +175,10 @@ module Dri
       pipelines = []
 
       labels.each do |label|
-        matchers = { 'found:' => ' ' }
+        matchers = { FOUND => ' ' }
 
-        if label.include? "found:"
-          pipeline = label.gsub(/found:/) { |match| matchers[match] }
+        if label.include? FOUND
+          pipeline = label.gsub(/#{FOUND}/o) { |match| matchers[match] }
           pipelines << pipeline.strip
         end
       end
@@ -168,7 +187,7 @@ module Dri
 
     def filter_failure_type_labels(labels)
       labels.each do |label|
-        @type = label.gsub!('failure::', ' ').to_s if label.include? "failure::"
+        @type = label.gsub!(FAILURE, ' ').to_s if label.include? FAILURE
       end
       @type
     end

data/lib/dri/utils/constants.rb

@@ -3,6 +3,39 @@
 module Dri
   module Utils
     module Constants
+      module ProjectIDs
+        TESTCASES_PROJECT_ID        = 11229385
+        TRIAGE_PROJECT_ID           = 15291320
+        GITLAB_PROJECT_ID           = 278964
+        CUSTOMERSDOT_PROJECT_ID     = 2670515
+        FEATURE_FLAG_LOG_PROJECT_ID = 15208716
+        INFRA_TEAM_PROD_PROJECT_ID  = 7444821
+      end
+
+      module Triage
+        module Labels
+          FOUND = 'found:'
+          FAILURE = 'failure::'
+          FAILURE_NEW = "#{FAILURE}new"
+          INCIDENT = 'Incident::'
+          SERVICE = 'Service::'
+          QA = 'QA'
+          QUALITY = 'Quality'
+          QUARANTINE = 'quarantine'
+        end
+      end
+
+      module FeatureFlag
+        module Labels
+          PRODUCTION  = 'host::gitlab.com'
+          STAGING     = 'host::staging.gitlab.com'
+          STAGING_REF = 'host::staging-ref.gitlab.com'
+          PREPROD     = 'host::pre.gitlab.com'
+        end
+
+        TITLE_SUBSTRINGS = ["set to \"true\"", "set to \"false\""].freeze
+      end
+
       PIPELINE_ENVIRONMENTS =
         {
           production: {
@@ -49,9 +82,9 @@ module Dri
           },
           master: {
             name: "master",
-            url: "https://gitlab.com/gitlab-org/gitlab-qa-mirror",
-            project_id: "14707715",
-            search_hours_ago: 6
+            url: "https://gitlab.com/gitlab-org/gitlab",
+            project_id: "278964",
+            search_hours_ago: 3
           }
         }.freeze
     end

data/lib/dri/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dri
-  VERSION = "0.6.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dri
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
@@ -355,7 +355,6 @@ files:
 - lib/dri/refinements/truncate.rb
 - lib/dri/report.rb
 - lib/dri/utils/constants.rb
-- lib/dri/utils/feature_flag_consts.rb
 - lib/dri/utils/markdown_lists.rb
 - lib/dri/utils/table.rb
 - lib/dri/version.rb

data/lib/dri/utils/feature_flag_consts.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Dri
-  module Utils
-    module FeatureFlagConsts
-      PRODUCTION  = 'host::gitlab.com'
-      STAGING     = 'host::staging.gitlab.com'
-      STAGING_REF = 'host::staging-ref.gitlab.com'
-      PREPROD     = 'host::pre.gitlab.com'
-      TITLE_SUBSTRINGS = ["set to \"true\"", "set to \"false\""].freeze
-    end
-  end
-end