Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

7 files changed, 27 insertions, 16 deletions

diff --git a/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb b/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
index f637001f9f8..9c12d46cede 100644
--- a/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
+++ b/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
@@ -40,7 +40,13 @@ module Gitlab
             ::Ci::Pipeline
               .id_in(pipeline_ids)
               .with_only_interruptible_builds
-              .each { |cancelable| cancelable.auto_cancel_running(pipeline) }
+              .each do |cancelable_pipeline|
+                # cascade_to_children not needed because we iterate through descendants here
+                cancelable_pipeline.cancel_running(
+                  auto_canceled_by_pipeline_id: pipeline.id,
+                  cascade_to_children: false
+                )
+              end
           end
         end
       end
diff --git a/lib/gitlab/ci/pipeline/chain/validate/external.rb b/lib/gitlab/ci/pipeline/chain/validate/external.rb
index 8177502be1d..6e95c7988fc 100644
--- a/lib/gitlab/ci/pipeline/chain/validate/external.rb
+++ b/lib/gitlab/ci/pipeline/chain/validate/external.rb
@@ -101,7 +101,8 @@ module Gitlab
                   ref: pipeline.ref,
                   type: pipeline.source
                 },
-                builds: builds_validation_payload
+                builds: builds_validation_payload,
+                total_builds_count: current_user.pipelines.jobs_count_in_alive_pipelines
               }
             end
 
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
index 6efb3a4f16a..c4f06c4686d 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/matches.rb
@@ -14,11 +14,9 @@ module Gitlab
 
               return false unless regexp
 
-              if ::Feature.enabled?(:ci_fix_rules_if_comparison_with_regexp_variable)
-                # All variables are evaluated as strings, even if they are regexp strings.
-                # So, we need to convert them to regexp objects.
-                regexp = Lexeme::Pattern.build_and_evaluate(regexp, variables)
-              end
+              # All variables are evaluated as strings, even if they are regexp strings.
+              # So, we need to convert them to regexp objects.
+              regexp = Lexeme::Pattern.build_and_evaluate(regexp, variables)
 
               regexp.scan(text.to_s).present?
             end
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb b/lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb
index a72e5dbc822..99d9206da74 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/not_matches.rb
@@ -14,11 +14,9 @@ module Gitlab
 
               return true unless regexp
 
-              if ::Feature.enabled?(:ci_fix_rules_if_comparison_with_regexp_variable)
-                # All variables are evaluated as strings, even if they are regexp strings.
-                # So, we need to convert them to regexp objects.
-                regexp = Lexeme::Pattern.build_and_evaluate(regexp, variables)
-              end
+              # All variables are evaluated as strings, even if they are regexp strings.
+              # So, we need to convert them to regexp objects.
+              regexp = Lexeme::Pattern.build_and_evaluate(regexp, variables)
 
               regexp.scan(text.to_s).empty?
             end
diff --git a/lib/gitlab/ci/pipeline/seed/build.rb b/lib/gitlab/ci/pipeline/seed/build.rb
index 901208f325a..93106b96af2 100644
--- a/lib/gitlab/ci/pipeline/seed/build.rb
+++ b/lib/gitlab/ci/pipeline/seed/build.rb
@@ -54,9 +54,11 @@ module Gitlab
           end
 
           def errors
-            return unless included?
-
             strong_memoize(:errors) do
+              # We check rules errors before checking "included?" because rules affects its inclusion status.
+              next rules_errors if rules_errors
+              next unless included?
+
               [needs_errors, variable_expansion_errors].compact.flatten
             end
           end
@@ -168,6 +170,12 @@ module Gitlab
             end
           end
 
+          def rules_errors
+            strong_memoize(:rules_errors) do
+              ["Failed to parse rule for #{name}: #{rules_result.errors.join(', ')}"] if rules_result.errors.present?
+            end
+          end
+
           def evaluate_context
             strong_memoize(:evaluate_context) do
               Gitlab::Ci::Build::Context::Build.new(@pipeline, @seed_attributes)
diff --git a/lib/gitlab/ci/pipeline/seed/environment.rb b/lib/gitlab/ci/pipeline/seed/environment.rb
index c8795840e5f..6bcc71a808b 100644
--- a/lib/gitlab/ci/pipeline/seed/environment.rb
+++ b/lib/gitlab/ci/pipeline/seed/environment.rb
@@ -30,7 +30,7 @@ module Gitlab
           end
 
           def deployment_tier
-            job.environment_deployment_tier
+            job.environment_tier_from_options
           end
 
           def expanded_environment_name
diff --git a/lib/gitlab/ci/pipeline/seed/stage.rb b/lib/gitlab/ci/pipeline/seed/stage.rb
index bc56fe9bef9..7cf6466cf4b 100644
--- a/lib/gitlab/ci/pipeline/seed/stage.rb
+++ b/lib/gitlab/ci/pipeline/seed/stage.rb
@@ -36,7 +36,7 @@ module Gitlab
 
           def errors
             strong_memoize(:errors) do
-              seeds.flat_map(&:errors).compact
+              @builds.flat_map(&:errors).compact
             end
           end