Add latest changes from gitlab-org/gitlab@master

3 files changed, 35 insertions, 2 deletions

diff --git a/lib/gitlab/ci/pipeline/chain/assign_partition.rb b/lib/gitlab/ci/pipeline/chain/assign_partition.rb
new file mode 100644
index 00000000000..672d95fe747
--- /dev/null
+++ b/lib/gitlab/ci/pipeline/chain/assign_partition.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        class AssignPartition < Chain::Base
+          include Chain::Helpers
+
+          DEFAULT_PARTITION_ID = 100
+
+          def perform!
+            @pipeline.partition_id = find_partition_id
+          end
+
+          def break?
+            @pipeline.errors.any?
+          end
+
+          private
+
+          # TODO handle parent-child pipelines
+          def find_partition_id
+            DEFAULT_PARTITION_ID
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/pipeline/seed/build.rb b/lib/gitlab/ci/pipeline/seed/build.rb
index 93106b96af2..2e4267e986b 100644
--- a/lib/gitlab/ci/pipeline/seed/build.rb
+++ b/lib/gitlab/ci/pipeline/seed/build.rb
@@ -148,7 +148,9 @@ module Gitlab
               ref: @pipeline.ref,
               tag: @pipeline.tag,
               trigger_request: @pipeline.legacy_trigger,
-              protected: @pipeline.protected_ref?
+              protected: @pipeline.protected_ref?,
+              partition_id: @pipeline.partition_id,
+              metadata_attributes: { partition_id: @pipeline.partition_id }
             }
           end
 
diff --git a/lib/gitlab/ci/pipeline/seed/stage.rb b/lib/gitlab/ci/pipeline/seed/stage.rb
index 7cf6466cf4b..1c4247bd5ee 100644
--- a/lib/gitlab/ci/pipeline/seed/stage.rb
+++ b/lib/gitlab/ci/pipeline/seed/stage.rb
@@ -25,7 +25,8 @@ module Gitlab
             { name: @attributes.fetch(:name),
               position: @attributes.fetch(:index),
               pipeline: @pipeline,
-              project: @pipeline.project }
+              project: @pipeline.project,
+              partition_id: @pipeline.partition_id }
           end
 
           def seeds