3 files changed, 15 insertions, 1 deletions
diff --git a/qa/qa/scenario/bootable.rb b/qa/qa/scenario/bootable.rb
index ae180ffce1c..2a9bbbc9fdb 100644
--- a/qa/qa/scenario/bootable.rb
+++ b/qa/qa/scenario/bootable.rb
@@ -31,6 +31,13 @@ module QA
                 end
 
                 next
+              elsif opt.name == :count_examples_only
+                parser.on(opt.arg, opt.desc) do |value|
+                  QA::Runtime::Env.dry_run = true
+                  Runtime::Scenario.define(opt.name, value)
+                end
+
+                next
               end
 
               parser.on(opt.arg, opt.desc) do |value|
diff --git a/qa/qa/scenario/shared_attributes.rb b/qa/qa/scenario/shared_attributes.rb
index ddbe28f05d9..d5d7aedb47f 100644
--- a/qa/qa/scenario/shared_attributes.rb
+++ b/qa/qa/scenario/shared_attributes.rb
@@ -13,6 +13,7 @@ module QA
         'Specify FEATURE_FLAGS as comma-separated flag=state pairs, e.g., "flag1=enabled,flag2=disabled"'
       attribute :parallel, '--parallel', 'Execute tests in parallel'
       attribute :loop, '--loop', 'Execute test repeatedly'
+      attribute :count_examples_only, '--count-examples-only', 'Return the number of examples without running them'
     end
   end
 end
diff --git a/qa/qa/scenario/template.rb b/qa/qa/scenario/template.rb
index 50bb952f1fd..ef634d3ccda 100644
--- a/qa/qa/scenario/template.rb
+++ b/qa/qa/scenario/template.rb
@@ -33,9 +33,15 @@ module QA
         Runtime::Scenario.define(:about_address, URI(-> { gitlab_address.host = "about.#{gitlab_address.host}"; gitlab_address }.call).to_s) # rubocop:disable Style/Semicolon
 
         ##
+        # Setup knapsack and download latest report
+        #
+        Tools::KnapsackReport.configure! if Runtime::Env.knapsack?
+
+        ##
         # Perform before hooks, which are different for CE and EE
         #
-        Runtime::Release.perform_before_hooks
+
+        Runtime::Release.perform_before_hooks unless Runtime::Env.dry_run
 
         Runtime::Feature.enable(options[:enable_feature]) if options.key?(:enable_feature)
         Runtime::Feature.disable(options[:disable_feature]) if options.key?(:disable_feature) && (@feature_enabled = Runtime::Feature.enabled?(options[:disable_feature]))