Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 645c519aca2..97ddbf21b99 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -33,6 +33,18 @@ FactoryBot.define do
       name { generate(:job_name) }
     end
 
+    trait :matrix do
+      sequence(:name) { |n| "job: [#{n}]" }
+      options do
+        {
+          parallel: {
+            total: 2,
+            matrix: [{ ID: %w[1 2] }]
+          }
+        }
+      end
+    end
+
     trait :dependent do
       scheduling_type { 'dag' }