1 files changed, 10 insertions, 8 deletions
diff --git a/app/models/ci/bridge.rb b/app/models/ci/bridge.rb
index 577bca282ef..97fb8233d34 100644
--- a/app/models/ci/bridge.rb
+++ b/app/models/ci/bridge.rb
@@ -28,10 +28,10 @@ module Ci
 
     state_machine :status do
       after_transition [:created, :manual, :waiting_for_resource] => :pending do |bridge|
-        next unless bridge.downstream_project
+        next unless bridge.triggers_downstream_pipeline?
 
         bridge.run_after_commit do
-          bridge.schedule_downstream_pipeline!
+          ::Ci::CreateCrossProjectPipelineWorker.perform_async(bridge.id)
         end
       end
 
@@ -64,12 +64,6 @@ module Ci
       )
     end
 
-    def schedule_downstream_pipeline!
-      raise InvalidBridgeTypeError unless downstream_project
-
-      ::Ci::CreateCrossProjectPipelineWorker.perform_async(self.id)
-    end
-
     def inherit_status_from_downstream!(pipeline)
       case pipeline.status
       when 'success'
@@ -112,10 +106,18 @@ module Ci
       pipeline if triggers_child_pipeline?
     end
 
+    def triggers_downstream_pipeline?
+      triggers_child_pipeline? || triggers_cross_project_pipeline?
+    end
+
     def triggers_child_pipeline?
       yaml_for_downstream.present?
     end
 
+    def triggers_cross_project_pipeline?
+      downstream_project_path.present?
+    end
+
     def tags
       [:bridge]
     end