Automatic merge of gitlab-org/gitlab master

.gitlab/ci/test-metadata.gitlab-ci.yml

@@ -8,6 +8,7 @@
       - knapsack/
       - rspec/
       - crystalball/
+    when: always
 
 retrieve-tests-metadata:
   extends:

.gitlab/issue_templates/Deprecations.md

@@ -40,7 +40,7 @@ Which tier is this feature available in?
   - To see who the stable counterparts are for a product team visit [product categories](https://about.gitlab.com/handbook/product/categories/)
        - If there is no stable counterpart listed for Sales/CS please mention `@timtams`
        - If there is no stable counterpart listed for Support please @mention `@gitlab-com/support/managers`
-       - If there is no stable counterpart listed for Marketing please mention `@williamchia`
+       - If there is no stable counterpart listed for Marketing please mention `@cfoster3`
 
 - [ ] @mention your GPM so that they are aware of planned deprecations. The goal is to have reviews happen at least two releases before the final removal of the feature or introduction of a breaking change.
 

app/models/concerns/issuable.rb

@@ -580,7 +580,7 @@ module Issuable
   ##
   # Overridden in MergeRequest
   #
-  def wipless_title_changed(old_title)
+  def draftless_title_changed(old_title)
     old_title != title
   end
 end

app/models/merge_request.rb

@@ -563,16 +563,22 @@ class MergeRequest < ApplicationRecord
 
   DRAFT_REGEX = /\A*#{Gitlab::Regex.merge_request_draft}+\s*/i.freeze
 
-  def self.work_in_progress?(title)
+  def self.draft?(title)
     !!(title =~ DRAFT_REGEX)
   end
 
-  def self.wipless_title(title)
+  def self.draftless_title(title)
     title.sub(DRAFT_REGEX, "")
   end
 
-  def self.wip_title(title)
-    work_in_progress?(title) ? title : "Draft: #{title}"
+  def self.draft_title(title)
+    draft?(title) ? title : "Draft: #{title}"
+  end
+
+  class << self
+    alias_method :work_in_progress?, :draft?
+    alias_method :wipless_title, :draftless_title
+    alias_method :wip_title, :draft_title
   end
 
   def self.participant_includes
@@ -585,9 +591,10 @@ class MergeRequest < ApplicationRecord
 
   # Verifies if title has changed not taking into account Draft prefix
   # for merge requests.
-  def wipless_title_changed(old_title)
-    self.class.wipless_title(old_title) != self.wipless_title
+  def draftless_title_changed(old_title)
+    self.class.draftless_title(old_title) != self.draftless_title
   end
+  alias_method :wipless_title_changed, :draftless_title_changed
 
   def hook_attrs
     Gitlab::HookData::MergeRequestBuilder.new(self).build
@@ -1086,18 +1093,20 @@ class MergeRequest < ApplicationRecord
     @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: :closed).last
   end
 
-  def work_in_progress?
-    self.class.work_in_progress?(title)
+  def draft?
+    self.class.draft?(title)
   end
-  alias_method :draft?, :work_in_progress?
+  alias_method :work_in_progress?, :draft?
 
-  def wipless_title
-    self.class.wipless_title(self.title)
+  def draftless_title
+    self.class.draftless_title(self.title)
   end
+  alias_method :wipless_title, :draftless_title
 
-  def wip_title
-    self.class.wip_title(self.title)
+  def draft_title
+    self.class.draft_title(self.title)
   end
+  alias_method :wip_title, :draft_title
 
   def mergeable?(skip_ci_check: false, skip_discussions_check: false)
     return false unless mergeable_state?(skip_ci_check: skip_ci_check,

app/services/issuable/common_system_notes_service.rb

@@ -71,7 +71,7 @@ module Issuable
     def create_title_change_note(old_title)
       create_draft_note(old_title)
 
-      if issuable.wipless_title_changed(old_title)
+      if issuable.draftless_title_changed(old_title)
         SystemNoteService.change_title(issuable, issuable.project, current_user, old_title)
       end
     end

app/views/shared/web_hooks/_hook.html.haml

@@ -22,4 +22,4 @@
     .col-md-4.col-lg-5.text-right-md.gl-mt-2
       %span>= render 'shared/web_hooks/test_button', hook: hook, button_class: 'btn-sm btn-default gl-mr-3'
       %span>= link_to _('Edit'), edit_hook_path(hook), class: 'btn gl-button btn-default btn-sm gl-mr-3'
-      = link_to _('Delete'), destroy_hook_path(hook), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn gl-button btn-secondary btn-danger-secondary btn-sm'
+      = link_to _('Delete'), destroy_hook_path(hook), aria: { label: s_('Webhooks|Delete webhook') }, data: { confirm_btn_variant: "danger", confirm: s_('Webhooks|Are you sure you want to delete this webhook?') }, method: :delete, class: 'btn gl-button btn-secondary btn-danger-secondary btn-sm'

locale/gitlab.pot

@@ -40375,6 +40375,9 @@ msgstr ""
 msgid "Webhooks|An issue is created, updated, closed, or reopened."
 msgstr ""
 
+msgid "Webhooks|Are you sure you want to delete this webhook?"
+msgstr ""
+
 msgid "Webhooks|Comments"
 msgstr ""
 
@@ -40384,6 +40387,9 @@ msgstr ""
 msgid "Webhooks|Confidential issues events"
 msgstr ""
 
+msgid "Webhooks|Delete webhook"
+msgstr ""
+
 msgid "Webhooks|Deployment events"
 msgstr ""
 

scripts/rspec_helpers.sh

@@ -209,6 +209,8 @@ function debug_rspec_variables() {
   echoinfo "NEW_FLAKY_RSPEC_REPORT_PATH: ${NEW_FLAKY_RSPEC_REPORT_PATH}"
   echoinfo "SKIPPED_FLAKY_TESTS_REPORT_PATH: ${SKIPPED_FLAKY_TESTS_REPORT_PATH}"
   echoinfo "RETRIED_TESTS_REPORT_PATH: ${RETRIED_TESTS_REPORT_PATH}"
+
+  echoinfo "CRYSTALBALL: ${CRYSTALBALL}"
 }
 
 function rspec_paralellized_job() {
@@ -245,11 +247,7 @@ function rspec_paralellized_job() {
 
   cp "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" "${KNAPSACK_REPORT_PATH}"
 
-  if [[ -z "${KNAPSACK_TEST_FILE_PATTERN}" ]]; then
-    pattern=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(${spec_folder_prefixes}).pattern(:${test_level})")
-    export KNAPSACK_TEST_FILE_PATTERN="${pattern}"
-  fi
-
+  export KNAPSACK_TEST_FILE_PATTERN=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(${spec_folder_prefixes}).pattern(:${test_level})")
   export FLAKY_RSPEC_REPORT_PATH="${rspec_flaky_folder_path}all_${report_name}_report.json"
   export NEW_FLAKY_RSPEC_REPORT_PATH="${rspec_flaky_folder_path}new_${report_name}_report.json"
   export SKIPPED_FLAKY_TESTS_REPORT_PATH="${rspec_flaky_folder_path}skipped_flaky_tests_${report_name}_report.txt"
@@ -285,21 +283,7 @@ function rspec_paralellized_job() {
   # Experiment to retry failed examples in a new RSpec process: https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1148
   if [[ $rspec_run_status -ne 0 ]]; then
     if [[ "${RETRY_FAILED_TESTS_IN_NEW_PROCESS}" == "true" ]]; then
-      # Keep track of the tests that are retried, later consolidated in a single file by the `rspec:flaky-tests-report` job
-      local failed_examples=$(grep " failed" ${RSPEC_LAST_RUN_RESULTS_FILE})
-      echo "${CI_JOB_URL}" > "${RETRIED_TESTS_REPORT_PATH}"
-      echo $failed_examples >> "${RETRIED_TESTS_REPORT_PATH}"
-
-      echoinfo "Retrying the failing examples in a new RSpec proces..."
-
-      install_junit_merge_gem
-
-      # Retry only the tests that failed on first try
-      rspec_simple_job "--only-failures" "${JUNIT_RETRY_FILE}"
-      rspec_run_status=$?
-
-      # Merge the JUnit report from retry into the first-try report
-      junit_merge "${JUNIT_RETRY_FILE}" "${JUNIT_RESULT_FILE}"
+      $rspec_run_status=$(retry_failed_rspec_examples)
     fi
   else
     echosuccess "No examples to retry, congrats!"
@@ -308,6 +292,31 @@ function rspec_paralellized_job() {
   exit $rspec_run_status
 }
 
+function retry_failed_rspec_examples() {
+  local rspec_run_status=0
+
+  # Keep track of the tests that are retried, later consolidated in a single file by the `rspec:flaky-tests-report` job
+  local failed_examples=$(grep " failed" ${RSPEC_LAST_RUN_RESULTS_FILE})
+  echo "${CI_JOB_URL}" > "${RETRIED_TESTS_REPORT_PATH}"
+  echo $failed_examples >> "${RETRIED_TESTS_REPORT_PATH}"
+
+  echoinfo "Retrying the failing examples in a new RSpec proces..."
+
+  install_junit_merge_gem
+
+  # Disable Crystalball on retry to not overwrite the existing report
+  export CRYSTALBALL="false"
+
+  # Retry only the tests that failed on first try
+  rspec_simple_job "--only-failures --pattern \"${KNAPSACK_TEST_FILE_PATTERN}\"" "${JUNIT_RETRY_FILE}"
+  rspec_run_status=$?
+
+  # Merge the JUnit report from retry into the first-try report
+  junit_merge "${JUNIT_RETRY_FILE}" "${JUNIT_RESULT_FILE}"
+
+  return $rspec_run_status
+}
+
 function rspec_rerun_previous_failed_tests() {
   local test_file_count_threshold=${RSPEC_PREVIOUS_FAILED_TEST_FILE_COUNT_THRESHOLD:-10}
   local matching_tests_file=${1}

spec/crystalball_env.rb

@@ -6,7 +6,7 @@ module CrystalballEnv
   extend self
 
   def start!
-    return unless ENV['CRYSTALBALL']
+    return unless ENV['CRYSTALBALL'] == 'true'
 
     require 'crystalball'
     require_relative '../tooling/lib/tooling/crystalball/coverage_lines_execution_detector'

spec/tooling/lib/tooling/test_map_generator_spec.rb

@@ -39,11 +39,23 @@ RSpec.describe Tooling::TestMapGenerator do
       YAML
     end
 
+    let(:yaml3) do
+      <<~YAML
+        ---
+        :type: Crystalball::ExecutionMap
+        :commit: 74056e8d9cf3773f43faa1cf5416f8779c8284c9
+        :timestamp: 1602671965
+        :version:
+        ---
+      YAML
+    end
+
     let(:pathname) { instance_double(Pathname) }
 
     before do
       stub_file_read('yaml1.yml', content: yaml1)
       stub_file_read('yaml2.yml', content: yaml2)
+      stub_file_read('yaml3.yml', content: yaml3)
     end
 
     context 'with single yaml' do
@@ -74,6 +86,10 @@ RSpec.describe Tooling::TestMapGenerator do
           expect(subject.mapping[file]).to match_array(tests)
         end
       end
+
+      it 'displays a warning when report has no examples' do
+        expect { subject.parse('yaml3.yml') }.to output(%|No examples in yaml3.yml! Metadata: {:type=>"Crystalball::ExecutionMap", :commit=>"74056e8d9cf3773f43faa1cf5416f8779c8284c9", :timestamp=>1602671965, :version=>nil}\n|).to_stdout
+      end
     end
 
     context 'with multiple yamls' do

tooling/lib/tooling/test_map_generator.rb

@@ -12,7 +12,12 @@ module Tooling
     def parse(yaml_files)
       Array(yaml_files).each do |yaml_file|
         data = File.read(yaml_file)
-        _metadata, example_groups = data.split("---\n").reject(&:empty?).map { |yml| YAML.safe_load(yml, [Symbol]) }
+        metadata, example_groups = data.split("---\n").reject(&:empty?).map { |yml| YAML.safe_load(yml, [Symbol]) }
+
+        if example_groups.nil?
+          puts "No examples in #{yaml_file}! Metadata: #{metadata}"
+          next
+        end
 
         example_groups.each do |example_id, files|
           files.each do |file|