Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 2 insertions, 4 deletions

diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 1d25964a4be..b2c1eff6fbd 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -18,15 +18,13 @@ FactoryBot.define do
     transient { child_of { nil } }
     transient { upstream_of { nil } }
 
-    before(:create) do |pipeline, evaluator|
-      pipeline.ensure_project_iid!
-    end
-
     after(:build) do |pipeline, evaluator|
       if evaluator.child_of
         pipeline.project = evaluator.child_of.project
         pipeline.source = :parent_pipeline
       end
+
+      pipeline.ensure_project_iid!
     end
 
     after(:create) do |pipeline, evaluator|