Refine pipeline stages seeds class

3 files changed, 59 insertions, 39 deletions

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index aa6c94f26c8..5e6c3d029c6 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -51,7 +51,7 @@ module Ci
     end
 
     def stages_for_ref(ref, tag = false, trigger_request = nil)
-      stages = @stages.map do |stage|
+      stages = @stages.uniq.map do |stage|
         builds = builds_for_stage_and_ref(stage, ref, tag, trigger_request)
 
         { name: stage, builds_attributes: builds.to_a } if builds.any?
diff --git a/lib/gitlab/ci/stage/seed.rb b/lib/gitlab/ci/stage/seed.rb
deleted file mode 100644
index 95237bff5d7..00000000000
--- a/lib/gitlab/ci/stage/seed.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-module Gitlab
-  module Ci
-    module Stage
-      class Seed
-        attr_reader :name, :builds
-
-        def initialize(name:, builds:)
-          @name = name
-          @builds = builds
-        end
-
-        def pipeline=(pipeline)
-          trigger_request = pipeline.trigger_requests.first
-
-          @builds.each do |attributes|
-            attributes.merge!(
-              pipeline: pipeline,
-              project: pipeline.project,
-              ref: pipeline.ref,
-              tag: pipeline.tag,
-              trigger_request: trigger_request
-            )
-          end
-        end
-
-        def user=(current_user)
-          @builds.each do |attributes|
-            attributes.merge!(user: current_user)
-          end
-        end
-
-        def to_attributes
-          { name: @name, builds_attributes: @builds }
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/ci/stage/seeds.rb b/lib/gitlab/ci/stage/seeds.rb
new file mode 100644
index 00000000000..16c436b5d4f
--- /dev/null
+++ b/lib/gitlab/ci/stage/seeds.rb
@@ -0,0 +1,58 @@
+module Gitlab
+  module Ci
+    module Stage
+      class Seeds
+        Seed = Struct.new(:stage, :jobs)
+
+        def initialize
+          @stages = []
+        end
+
+        def stages
+          @stages.map(&:stage)
+        end
+
+        def jobs
+          @stages.map(&:jobs).flatten
+        end
+
+        def append_stage(stage, jobs)
+          @stages << Seed.new({ name: stage }, jobs)
+        end
+
+        def pipeline=(pipeline)
+          trigger_request = pipeline.trigger_requests.first
+
+          stages.each do |attributes|
+            attributes.merge!(
+              pipeline: pipeline,
+              project: pipeline.project,
+            )
+          end
+
+          jobs.each do |attributes|
+            attributes.merge!(
+              pipeline: pipeline,
+              project: pipeline.project,
+              ref: pipeline.ref,
+              tag: pipeline.tag,
+              trigger_request: trigger_request
+            )
+          end
+        end
+
+        def user=(current_user)
+          jobs.each do |attributes|
+            attributes.merge!(user: current_user)
+          end
+        end
+
+        def to_attributes
+          @stages.map.with_index do |seed|
+            seed.stage.merge(builds_attributes: seed.jobs)
+          end
+        end
+      end
+    end
+  end
+end