Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 4 insertions, 1 deletions

diff --git a/scripts/static-analysis b/scripts/static-analysis
index de5a1b407f9..f50e4a24b58 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -54,6 +54,7 @@ class StaticAnalysis
     Task.new(%w[bin/rake gettext:lint], 85),
     Task.new(%W[bundle exec license_finder --decisions-file config/dependency_decisions.yml --project-path #{project_path}], 20),
     Task.new(%w[bin/rake lint:static_verification], 35),
+    Task.new(%w[scripts/rubocop-max-files-in-cache-check], 20),
     Task.new(%w[bin/rake config_lint], 10),
     Task.new(%w[bin/rake gitlab:sidekiq:all_queues_yml:check], 15),
     (Gitlab.ee? ? Task.new(%w[bin/rake gitlab:sidekiq:sidekiq_queues_yml:check], 11) : nil),
@@ -65,7 +66,9 @@ class StaticAnalysis
   ].compact.freeze
 
   def run_tasks!(options = {})
-    node_assignment = tasks_to_run((ENV['CI_NODE_TOTAL'] || 1).to_i)[(ENV['CI_NODE_INDEX'] || 1).to_i - 1]
+    total_nodes = (ENV['CI_NODE_TOTAL'] || 1).to_i
+    current_node_number = (ENV['CI_NODE_INDEX'] || 1).to_i
+    node_assignment = tasks_to_run(total_nodes)[current_node_number - 1]
 
     if options[:dry_run]
       puts "Dry-run mode!"