Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 4 deletions

diff --git a/qa/qa/support/knapsack_report.rb b/qa/qa/support/knapsack_report.rb
index 998802fe8b7..8114e838ede 100644
--- a/qa/qa/support/knapsack_report.rb
+++ b/qa/qa/support/knapsack_report.rb
@@ -13,6 +13,10 @@ module QA
 
       def_delegators :new, :configure!, :move_regenerated_report, :download_report, :upload_report
 
+      def initialize(report_name = nil)
+        @report_name = report_name
+      end
+
       # Configure knapsack report
       #
       # * Setup variables
@@ -31,8 +35,8 @@ module QA
       #
       # @return [void]
       def download_report
-        logger.debug("Downloading latest knapsack report for '#{report_name}' to '#{report_path}'")
-        return logger.debug("Report already exists, skipping!") if File.exist?(report_path)
+        logger.info("Downloading latest knapsack report for '#{report_name}' to '#{report_path}'")
+        return logger.info("Report already exists, skipping!") if File.exist?(report_path)
 
         file = client.get_object(BUCKET, report_file)
         File.write(report_path, file[:body])
diff --git a/qa/tasks/knapsack.rake b/qa/tasks/knapsack.rake
index cfc11d0ba24..2ffc18eb3d5 100644
--- a/qa/tasks/knapsack.rake
+++ b/qa/tasks/knapsack.rake
@@ -16,9 +16,15 @@ namespace :knapsack do
     exit QA::Specs::KnapsackRunner.run(rspec_args)
   end
 
-  desc "Download latest knapsack report"
+  desc "Download latest knapsack report or multiple reports passed via QA_KNAPSACK_REPORTS env variable"
   task :download do
-    QA::Support::KnapsackReport.download_report
+    next QA::Support::KnapsackReport.download_report unless ENV["QA_KNAPSACK_REPORTS"]
+
+    ENV["QA_KNAPSACK_REPORTS"].split(",").each do |report_name|
+      QA::Support::KnapsackReport.new(report_name).download_report
+    rescue StandardError => e
+      QA::Runtime::Logger.error(e)
+    end
   end
 
   desc "Merge and upload knapsack report"