Add latest changes from gitlab-org/gitlab@16-6-stable-ee

3 files changed, 27 insertions, 1 deletions

diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index 0a06418e7c6..7c72c301aef 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -121,6 +121,7 @@ trigger-omnibus as-if-foss:
     # Override gitlab repository so that omnibus doesn't use foss repository for CE build
     GITLAB_ALTERNATIVE_REPO: $CI_PROJECT_URL
 
+# If a rename is required for this job, please notify the Delivery team (`@gitlab-org/delivery`)
 e2e:package-and-test-ee:
   extends:
     - .e2e-trigger-base
diff --git a/spec/tooling/danger/stable_branch_spec.rb b/spec/tooling/danger/stable_branch_spec.rb
index a33788f54f2..472fbc54e80 100644
--- a/spec/tooling/danger/stable_branch_spec.rb
+++ b/spec/tooling/danger/stable_branch_spec.rb
@@ -251,6 +251,31 @@ RSpec.describe Tooling::Danger::StableBranch, feature_category: :delivery do
         end
       end
 
+      context 'with multiple package-and-test pipelines' do
+        let(:pipeline_bridges_response) do
+          [
+            {
+              'name' => 'e2e:package-and-test-ee',
+              'status' => 'success',
+              'downstream_pipeline' => {
+                'id' => '123',
+                'status' => package_and_qa_state
+              }
+            },
+            {
+              'name' => 'follow-up-e2e:package-and-test-ee',
+              'status' => 'failed',
+              'downstream_pipeline' => {
+                'id' => '456',
+                'status' => 'failed'
+              }
+            }
+          ]
+        end
+
+        it_behaves_like 'without a failure'
+      end
+
       context 'when the version API request fails' do
         let(:response_success) { false }
 
diff --git a/tooling/danger/stable_branch.rb b/tooling/danger/stable_branch.rb
index 8cb9e87964f..4f09d243dd5 100644
--- a/tooling/danger/stable_branch.rb
+++ b/tooling/danger/stable_branch.rb
@@ -108,7 +108,7 @@ module Tooling
         gitlab
           .api
           .pipeline_bridges(helper.mr_target_project_id, mr_head_pipeline_id)
-          &.find { |bridge| bridge['name'].include?('package-and-test-ee') }
+          &.find { |bridge| bridge['name'] == 'e2e:package-and-test-ee' }
       end
 
       def stable_target_branch