Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

2 files changed, 20 insertions, 14 deletions

diff --git a/qa/tasks/knapsack.rake b/qa/tasks/knapsack.rake
new file mode 100644
index 00000000000..ea15793a457
--- /dev/null
+++ b/qa/tasks/knapsack.rake
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+# rubocop:disable Rails/RakeEnvironment
+
+require_relative "../qa/tools/knapsack_report"
+
+namespace :knapsack do
+  desc "Download latest knapsack report"
+  task :download do
+    QA::Tools::KnapsackReport.download
+  end
+
+  desc "Merge and upload knapsack report"
+  task :upload, [:glob_pattern] do |_task, args|
+    QA::Tools::KnapsackReport.upload(args[:glob_pattern])
+  end
+end
+# rubocop:enable Rails/RakeEnvironment
diff --git a/qa/tasks/reliable_report.rake b/qa/tasks/reliable_report.rake
index 204c959093a..4ec86779704 100644
--- a/qa/tasks/reliable_report.rake
+++ b/qa/tasks/reliable_report.rake
@@ -3,19 +3,8 @@
 
 require_relative "../qa/tools/reliable_report"
 
-desc "Fetch top most reliable specs"
-task :reliable_spec_report, [:run_type, :range, :create_slack_report] do |_task, args|
-  report = QA::Tools::ReliableReport.new(args[:run_type] || "package-and-qa", args[:range])
-
-  report.show_top_stable
-  report.notify_top_stable if args[:create_slack_report] == 'true'
-end
-
-desc "Fetch top most unstable reliable specs"
-task :unreliable_spec_report, [:run_type, :range, :create_slack_report] do |_task, args|
-  report = QA::Tools::ReliableReport.new(args[:run_type] || "package-and-qa", args[:range])
-
-  report.show_top_unstable
-  report.notify_top_unstable if args[:create_slack_report] == 'true'
+desc "Fetch reliable and unreliable spec data and create report"
+task :reliable_spec_report, [:range, :report_in_issue_and_slack] do |_task, args|
+  QA::Tools::ReliableReport.run(**args)
 end
 # rubocop:enable Rails/RakeEnvironment