From 3c6fee700d52db4da1b3662caf6e1dfe76f56977 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 17 Jul 2019 17:17:02 -0500 Subject: CE-EE parity for pipelines development fixture --- db/fixtures/development/14_pipelines.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/db/fixtures/development/14_pipelines.rb b/db/fixtures/development/14_pipelines.rb index db043e39d2c..ffba934021e 100644 --- a/db/fixtures/development/14_pipelines.rb +++ b/db/fixtures/development/14_pipelines.rb @@ -79,7 +79,15 @@ class Gitlab::Seeder::Pipelines def create_master_pipelines @project.repository.commits('master', limit: 4).map do |commit| - create_pipeline!(@project, 'master', commit) + create_pipeline!(@project, 'master', commit).tap do |pipeline| + random_pipeline.tap do |triggered_by_pipeline| + triggered_by_pipeline.sourced_pipelines.create( + source_job: triggered_by_pipeline.builds.all.sample, + source_project: triggered_by_pipeline.project, + project: pipeline.project, + pipeline: pipeline) + end + end end rescue [] @@ -231,6 +239,10 @@ class Gitlab::Seeder::Pipelines @project.team.users.sample end + def random_pipeline + Ci::Pipeline.limit(4).all.sample + end + def build_status Ci::Build::AVAILABLE_STATUSES.sample end -- cgit v1.2.1 From 6331ddbe56a30b230935995d1daf644761f154eb Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Mon, 22 Jul 2019 11:42:16 -0500 Subject: CE pipelines don't respond to sourced_pipelines We also scope the `rescue`s to only those raised by ActiveRecord, which would have allowed us to spot this logic error sooner. --- db/fixtures/development/14_pipelines.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/fixtures/development/14_pipelines.rb b/db/fixtures/development/14_pipelines.rb index ffba934021e..05bda7d3672 100644 --- a/db/fixtures/development/14_pipelines.rb +++ b/db/fixtures/development/14_pipelines.rb @@ -81,7 +81,7 @@ class Gitlab::Seeder::Pipelines @project.repository.commits('master', limit: 4).map do |commit| create_pipeline!(@project, 'master', commit).tap do |pipeline| random_pipeline.tap do |triggered_by_pipeline| - triggered_by_pipeline.sourced_pipelines.create( + triggered_by_pipeline.try(:sourced_pipelines)&.create( source_job: triggered_by_pipeline.builds.all.sample, source_project: triggered_by_pipeline.project, project: pipeline.project, @@ -89,7 +89,7 @@ class Gitlab::Seeder::Pipelines end end end - rescue + rescue ActiveRecord::ActiveRecordError [] end @@ -106,7 +106,7 @@ class Gitlab::Seeder::Pipelines end pipelines.flatten - rescue + rescue ActiveRecord::ActiveRecordError [] end -- cgit v1.2.1