Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index c0f7948f963..0bd39d4cdcf 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -211,6 +211,17 @@ FactoryBot.define do
       build.project ||= build.pipeline.project
     end
 
+    trait :with_deployment do
+      after(:build) do |build, evaluator|
+        ##
+        # Build deployment/environment relations if environment name is set
+        # to the job. If `build.deployment` has already been set, it doesn't
+        # build a new instance.
+        build.deployment =
+          Gitlab::Ci::Pipeline::Seed::Deployment.new(build).to_resource
+      end
+    end
+
     trait :tag do
       tag { true }
     end