Add latest changes from gitlab-org/gitlab@master

app/models/ci/pipeline.rb

@@ -214,7 +214,7 @@ module Ci
         end
       end
 
-      after_transition created: any - [:failed] do |pipeline|
+      after_transition created: :pending do |pipeline|
         next unless pipeline.bridge_triggered?
         next if pipeline.bridge_waiting?
 

app/services/ci/create_cross_project_pipeline_service.rb

@@ -18,7 +18,7 @@ module Ci
         current_user,
         pipeline_params.fetch(:target_revision))
 
-      downstream_pipeline = service.execute(
+      service.execute(
         pipeline_params.fetch(:source), pipeline_params[:execute_params]) do |pipeline|
           @bridge.sourced_pipelines.build(
             source_pipeline: @bridge.pipeline,
@@ -28,10 +28,6 @@ module Ci
 
           pipeline.variables.build(@bridge.downstream_variables)
         end
-
-      downstream_pipeline.tap do |pipeline|
-        @bridge.drop!(:downstream_pipeline_creation_failed) if pipeline.errors.any?
-      end
     end
 
     private

changelogs/unreleased/drop-bridge-on-any-pipeline-errors.yml

----
-title: Drop bridge on any downstream pipeline errors
-merge_request: 24735
-author:
-type: fixed

changelogs/unreleased/fix-upstream-bridge-stuck-when-non-pending-pipelines.yml

----
-title: Fix upstream bridge stuck when downstream pipeline is not pending
-merge_request: 24665
-author:
-type: fixed

changelogs/unreleased/mc-bug-fail-upstream-on-invalid-yaml.yml

----
-title: Fail upstream bridge on downstream pipeline creation failure.
-merge_request: 24092
-author:
-type: fixed

spec/models/ci/pipeline_spec.rb

@@ -2932,30 +2932,6 @@ describe Ci::Pipeline, :mailer do
           create(:ci_sources_pipeline, pipeline: pipeline, source_job: bridge)
         end
 
-        context 'when downstream pipeline status transitions to pending' do
-          it 'updates bridge status ' do
-            expect(pipeline).to receive(:update_bridge_status!).once
-
-            pipeline.run!
-          end
-        end
-
-        context 'when the status of downstream pipeline transitions to waiting_for_resource' do
-          it 'updates bridge status ' do
-            expect(pipeline).to receive(:update_bridge_status!).once
-
-            pipeline.request_resource!
-          end
-        end
-
-        context 'when the status of downstream pipeline transitions to failed' do
-          it 'does not update bridge status ' do
-            expect(pipeline).not_to receive(:update_bridge_status!)
-
-            pipeline.drop!
-          end
-        end
-
         describe '#bridge_triggered?' do
           it 'is a pipeline triggered by a bridge' do
             expect(pipeline).to be_bridge_triggered

spec/services/ci/create_cross_project_pipeline_service_spec.rb

@@ -267,34 +267,6 @@ describe Ci::CreateCrossProjectPipelineService, '#execute' do
       end
     end
 
-    context 'when downstream pipeline creation errors out' do
-      let(:stub_config) { false }
-
-      before do
-        stub_ci_pipeline_yaml_file(YAML.dump(invalid: { yaml: 'error' }))
-      end
-
-      it 'creates only one new pipeline' do
-        expect { service.execute(bridge) }
-          .to change { Ci::Pipeline.count }.by(1)
-      end
-
-      it 'creates a new pipeline in the downstream project' do
-        pipeline = service.execute(bridge)
-
-        expect(pipeline.user).to eq bridge.user
-        expect(pipeline.project).to eq downstream_project
-      end
-
-      it 'drops the bridge' do
-        pipeline = service.execute(bridge)
-
-        expect(pipeline.reload).to be_failed
-        expect(bridge.reload).to be_failed
-        expect(bridge.failure_reason).to eq('downstream_pipeline_creation_failed')
-      end
-    end
-
     context 'when bridge job has YAML variables defined' do
       before do
         bridge.yaml_variables = [{ key: 'BRIDGE', value: 'var', public: true }]