Merge branch 'feature/gb/cross-project-pipeline-trigger' into 'master'

Cross-project pipeline triggers /CE

See merge request gitlab-org/gitlab-ce!24664

7 files changed, 61 insertions, 12 deletions

diff --git a/app/models/ci/bridge.rb b/app/models/ci/bridge.rb
index 29aa00a66d9..5450d40ea95 100644
--- a/app/models/ci/bridge.rb
+++ b/app/models/ci/bridge.rb
@@ -2,11 +2,13 @@
 
 module Ci
   class Bridge < CommitStatus
+    include Ci::Processable
     include Importable
     include AfterCommitQueue
     include Gitlab::Utils::StrongMemoize
 
     belongs_to :project
+    belongs_to :trigger_request
     validates :ref, presence: true
 
     def self.retry(bridge, current_user)
@@ -23,6 +25,21 @@ module Ci
         .fabricate!
     end
 
+    def schedulable?
+      false
+    end
+
+    def action?
+      false
+    end
+
+    def artifacts?
+      false
+    end
+
+    def expanded_environment_name
+    end
+
     def predefined_variables
       raise NotImplementedError
     end
@@ -30,5 +47,9 @@ module Ci
     def execute_hooks
       raise NotImplementedError
     end
+
+    def to_partial_path
+      'projects/generic_commit_statuses/generic_commit_status'
+    end
   end
 end
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index cfdb3c0d719..35cf4f8d277 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -3,6 +3,7 @@
 module Ci
   class Build < CommitStatus
     prepend ArtifactMigratable
+    include Ci::Processable
     include TokenAuthenticatable
     include AfterCommitQueue
     include ObjectStorage::BackgroundMove
@@ -638,10 +639,6 @@ module Ci
       super || project.try(:build_coverage_regex)
     end
 
-    def when
-      read_attribute(:when) || 'on_success'
-    end
-
     def options
       read_metadata_attribute(:options, :config_options, {})
     end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 30a957b4117..acef5d2e643 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -25,6 +25,8 @@ module Ci
 
     has_many :stages, -> { order(position: :asc) }, inverse_of: :pipeline
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
+    has_many :processables, -> { processables },
+             class_name: 'CommitStatus', foreign_key: :commit_id, inverse_of: :pipeline
     has_many :builds, foreign_key: :commit_id, inverse_of: :pipeline
     has_many :trigger_requests, dependent: :destroy, foreign_key: :commit_id # rubocop:disable Cop/ActiveRecordDependent
     has_many :variables, class_name: 'Ci::PipelineVariable'
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index 58f3fe2460a..0389945191e 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -14,6 +14,7 @@ module Ci
 
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :stage_id
     has_many :builds, foreign_key: :stage_id
+    has_many :bridges, foreign_key: :stage_id
 
     with_options unless: :importing? do
       validates :project, presence: true
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 0f50bd39131..7f6562b63e5 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -41,6 +41,7 @@ class CommitStatus < ActiveRecord::Base
   scope :latest_ordered, -> { latest.ordered.includes(project: :namespace) }
   scope :retried_ordered, -> { retried.ordered.includes(project: :namespace) }
   scope :after_stage, -> (index) { where('stage_idx > ?', index) }
+  scope :processables, -> { where(type: %w[Ci::Build Ci::Bridge]) }
 
   # We use `CommitStatusEnums.failure_reasons` here so that EE can more easily
   # extend this `Hash` with new values.
diff --git a/app/models/concerns/ci/processable.rb b/app/models/concerns/ci/processable.rb
new file mode 100644
index 00000000000..1c78b1413a8
--- /dev/null
+++ b/app/models/concerns/ci/processable.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Ci
+  ##
+  # This module implements methods that need to be implemented by CI/CD
+  # entities that are supposed to go through pipeline processing
+  # services.
+  #
+  #
+  module Processable
+    def schedulable?
+      raise NotImplementedError
+    end
+
+    def action?
+      raise NotImplementedError
+    end
+
+    def when
+      read_attribute(:when) || 'on_success'
+    end
+
+    def expanded_environment_name
+      raise NotImplementedError
+    end
+  end
+end
diff --git a/app/services/ci/process_pipeline_service.rb b/app/services/ci/process_pipeline_service.rb
index 446188347df..4a7ce00b8e2 100644
--- a/app/services/ci/process_pipeline_service.rb
+++ b/app/services/ci/process_pipeline_service.rb
@@ -10,7 +10,7 @@ module Ci
       update_retried
 
       new_builds =
-        stage_indexes_of_created_builds.map do |index|
+        stage_indexes_of_created_processables.map do |index|
           process_stage(index)
         end
 
@@ -27,7 +27,7 @@ module Ci
       return if HasStatus::BLOCKED_STATUS.include?(current_status)
 
       if HasStatus::COMPLETED_STATUSES.include?(current_status)
-        created_builds_in_stage(index).select do |build|
+        created_processables_in_stage(index).select do |build|
           Gitlab::OptimisticLocking.retry_lock(build) do |subject|
             Ci::ProcessBuildService.new(project, @user)
               .execute(build, current_status)
@@ -43,19 +43,19 @@ module Ci
     # rubocop: enable CodeReuse/ActiveRecord
 
     # rubocop: disable CodeReuse/ActiveRecord
-    def stage_indexes_of_created_builds
-      created_builds.order(:stage_idx).pluck('distinct stage_idx')
+    def stage_indexes_of_created_processables
+      created_processables.order(:stage_idx).pluck('distinct stage_idx')
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
     # rubocop: disable CodeReuse/ActiveRecord
-    def created_builds_in_stage(index)
-      created_builds.where(stage_idx: index)
+    def created_processables_in_stage(index)
+      created_processables.where(stage_idx: index)
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
-    def created_builds
-      pipeline.builds.created
+    def created_processables
+      pipeline.processables.created
     end
 
     # This method is for compatibility and data consistency and should be removed with 9.3 version of GitLab