From c13abe19186138fc709b0428dfff5d6b0ce70c9e Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Thu, 4 Nov 2021 13:03:14 -0400 Subject: [PATCH 01/15] Add Ci::Pipelines to the project migration --- .../projects/pipelines/ci_pipeline_pipeline.rb | 15 +++++++++++++++ lib/bulk_imports/projects/stage.rb | 4 ++++ spec/lib/bulk_imports/projects/stage_spec.rb | 1 + 3 files changed, 20 insertions(+) create mode 100644 lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb diff --git a/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb b/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb new file mode 100644 index 00000000000000..74e544ff35574f --- /dev/null +++ b/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module BulkImports + module Projects + module Pipelines + class CiPipelinePipeline + include NdjsonPipeline + + relation_name 'all_pipelines' + + extractor ::BulkImports::Common::Extractors::NdjsonExtractor, relation: relation + end + end + end +end diff --git a/lib/bulk_imports/projects/stage.rb b/lib/bulk_imports/projects/stage.rb index 9ccc9efff1d99b..45b2b3aa572bcc 100644 --- a/lib/bulk_imports/projects/stage.rb +++ b/lib/bulk_imports/projects/stage.rb @@ -47,6 +47,10 @@ def config pipeline: BulkImports::Common::Pipelines::WikiPipeline, stage: 5 }, + all_pipelines: { + pipeline: BulkImports::Projects::Pipelines::CiPipelinePipeline, + stage: 4 + } uploads: { pipeline: BulkImports::Common::Pipelines::UploadsPipeline, stage: 5 diff --git a/spec/lib/bulk_imports/projects/stage_spec.rb b/spec/lib/bulk_imports/projects/stage_spec.rb index e7670085f603c7..cb31ac9af7e1e5 100644 --- a/spec/lib/bulk_imports/projects/stage_spec.rb +++ b/spec/lib/bulk_imports/projects/stage_spec.rb @@ -15,6 +15,7 @@ [4, BulkImports::Projects::Pipelines::ExternalPullRequestsPipeline], [4, BulkImports::Projects::Pipelines::ProtectedBranchesPipeline], [5, BulkImports::Common::Pipelines::WikiPipeline], + [4, BulkImports::Projects::Pipelines::CiPipelinePipeline], [5, BulkImports::Common::Pipelines::UploadsPipeline], [6, BulkImports::Common::Pipelines::EntityFinisher] ] -- GitLab From e64014aaa985c778df836e95410c002c8f2c0a9f Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Thu, 4 Nov 2021 15:31:53 -0400 Subject: [PATCH 02/15] Missed comma in project pipeline stages --- lib/bulk_imports/projects/stage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bulk_imports/projects/stage.rb b/lib/bulk_imports/projects/stage.rb index 45b2b3aa572bcc..3c2a341d6d5b33 100644 --- a/lib/bulk_imports/projects/stage.rb +++ b/lib/bulk_imports/projects/stage.rb @@ -50,7 +50,7 @@ def config all_pipelines: { pipeline: BulkImports::Projects::Pipelines::CiPipelinePipeline, stage: 4 - } + }, uploads: { pipeline: BulkImports::Common::Pipelines::UploadsPipeline, stage: 5 -- GitLab From a38de5141028a3810bb16c3276f685ef8c12d2c5 Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Fri, 5 Nov 2021 11:35:54 -0400 Subject: [PATCH 03/15] Initial working test for Ci::Pipelines --- .../pipelines/ci_pipeline_pipeline.rb | 2 +- .../pipelines/ci_pipeline_pipeline_spec.rb | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb diff --git a/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb b/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb index 74e544ff35574f..ff55f11a502b33 100644 --- a/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb +++ b/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb @@ -6,7 +6,7 @@ module Pipelines class CiPipelinePipeline include NdjsonPipeline - relation_name 'all_pipelines' + relation_name 'ci_pipelines' extractor ::BulkImports::Common::Extractors::NdjsonExtractor, relation: relation end diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb new file mode 100644 index 00000000000000..1fc1b09558e5fe --- /dev/null +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb @@ -0,0 +1,52 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe BulkImports::Projects::Pipelines::CiPipelinePipeline do + let_it_be(:user) { create(:user) } + let_it_be(:group) { create(:group) } + let_it_be(:project) { create(:project, group: group) } + let_it_be(:bulk_import) { create(:bulk_import, user: user) } + let_it_be(:entity) do + create( + :bulk_import_entity, + :project_entity, + project: project, + bulk_import: bulk_import, + source_full_path: 'source/full/path', + destination_name: 'My Destination Project', + destination_namespace: group.full_path + ) + end + + let(:ci_pipeline_attributes) { {} } + let(:ci_pipeline) do + { + sha: "fakesha", + ref: "fakeref", + project: project, + source: "web" + }.merge(ci_pipeline_attributes) + end + + let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) } + let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) } + + subject(:pipeline) { described_class.new(context) } + + describe '#run' do + before do + group.add_owner(user) + + allow_next_instance_of(BulkImports::Common::Extractors::NdjsonExtractor) do |extractor| + allow(extractor).to receive(:extract).and_return(BulkImports::Pipeline::ExtractedData.new(data: [ci_pipeline])) + end + + pipeline.run + end + + it 'imports Ci::Pipeline into destination project' do + expect(project.all_pipelines.count).to eq(1) + end + end +end -- GitLab From faf53e73b0250511b8fb6c973828a3968d2cc61f Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 10:30:24 -0500 Subject: [PATCH 04/15] Add test for notes --- .../pipelines/ci_pipeline_pipeline_spec.rb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb index 1fc1b09558e5fe..57da76d6032795 100644 --- a/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb @@ -48,5 +48,29 @@ it 'imports Ci::Pipeline into destination project' do expect(project.all_pipelines.count).to eq(1) end + + context 'notes' do + let(:ci_pipeline_attributes) { + { + 'notes' => [ + { + 'note' => 'test note', + 'author_id' => 22, + 'noteable_type' => 'Commit', + 'sha' => '', + 'author' => { + 'name' => 'User 22' + }, + 'commit_id' => 'fakesha', + 'updated_at' => '2016-06-14T15:02:47.770Z' + } + ] + } + } + + it 'imports pipeline with notes' do + expect(project.all_pipelines.first.notes.first.note).to include('test note') + end + end end end -- GitLab From 762e413feb4d6e67657b3a0778324875d19c4c2a Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 10:35:18 -0500 Subject: [PATCH 05/15] Add test for stages --- .../pipelines/ci_pipeline_pipeline_spec.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb index 57da76d6032795..d2be4f9bab4d5b 100644 --- a/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb @@ -72,5 +72,21 @@ expect(project.all_pipelines.first.notes.first.note).to include('test note') end end + + context 'stages' do + let(:ci_pipeline_attributes) { + { + 'stages' => [ + { + 'name' => 'test stage' + } + ] + } + } + + it 'imports pipeline with notes' do + expect(project.all_pipelines.first.stages.first.name).to eq('test stage') + end + end end end -- GitLab From d3dfbf730ccfc3620d596738811d95a45e1c4127 Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 10:37:33 -0500 Subject: [PATCH 06/15] Rename to CiPipelinesPipeline --- .../{ci_pipeline_pipeline.rb => ci_pipelines_pipeline.rb} | 2 +- lib/bulk_imports/projects/stage.rb | 2 +- ..._pipeline_pipeline_spec.rb => ci_pipelines_pipeline_spec.rb} | 2 +- spec/lib/bulk_imports/projects/stage_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename lib/bulk_imports/projects/pipelines/{ci_pipeline_pipeline.rb => ci_pipelines_pipeline.rb} (89%) rename spec/lib/bulk_imports/projects/pipelines/{ci_pipeline_pipeline_spec.rb => ci_pipelines_pipeline_spec.rb} (97%) diff --git a/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb b/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline.rb similarity index 89% rename from lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb rename to lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline.rb index ff55f11a502b33..4487835b88ec88 100644 --- a/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline.rb +++ b/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline.rb @@ -3,7 +3,7 @@ module BulkImports module Projects module Pipelines - class CiPipelinePipeline + class CiPipelinesPipeline include NdjsonPipeline relation_name 'ci_pipelines' diff --git a/lib/bulk_imports/projects/stage.rb b/lib/bulk_imports/projects/stage.rb index 3c2a341d6d5b33..c13120c4e3211e 100644 --- a/lib/bulk_imports/projects/stage.rb +++ b/lib/bulk_imports/projects/stage.rb @@ -48,7 +48,7 @@ def config stage: 5 }, all_pipelines: { - pipeline: BulkImports::Projects::Pipelines::CiPipelinePipeline, + pipeline: BulkImports::Projects::Pipelines::CiPipelinesPipeline, stage: 4 }, uploads: { diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb similarity index 97% rename from spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb rename to spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb index d2be4f9bab4d5b..070c5232b692cc 100644 --- a/spec/lib/bulk_imports/projects/pipelines/ci_pipeline_pipeline_spec.rb +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe BulkImports::Projects::Pipelines::CiPipelinePipeline do +RSpec.describe BulkImports::Projects::Pipelines::CiPipelinesPipeline do let_it_be(:user) { create(:user) } let_it_be(:group) { create(:group) } let_it_be(:project) { create(:project, group: group) } diff --git a/spec/lib/bulk_imports/projects/stage_spec.rb b/spec/lib/bulk_imports/projects/stage_spec.rb index cb31ac9af7e1e5..58106bff16131d 100644 --- a/spec/lib/bulk_imports/projects/stage_spec.rb +++ b/spec/lib/bulk_imports/projects/stage_spec.rb @@ -14,8 +14,8 @@ [4, BulkImports::Projects::Pipelines::MergeRequestsPipeline], [4, BulkImports::Projects::Pipelines::ExternalPullRequestsPipeline], [4, BulkImports::Projects::Pipelines::ProtectedBranchesPipeline], + [4, BulkImports::Projects::Pipelines::CiPipelinesPipeline], [5, BulkImports::Common::Pipelines::WikiPipeline], - [4, BulkImports::Projects::Pipelines::CiPipelinePipeline], [5, BulkImports::Common::Pipelines::UploadsPipeline], [6, BulkImports::Common::Pipelines::EntityFinisher] ] -- GitLab From 835c0d4337de777c903eaf36faf5e010abd5b27d Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 11:26:01 -0500 Subject: [PATCH 07/15] Fix rubocop failures --- .../projects/pipelines/ci_pipelines_pipeline_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb index 070c5232b692cc..0865c66afae9be 100644 --- a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb @@ -50,7 +50,7 @@ end context 'notes' do - let(:ci_pipeline_attributes) { + let(:ci_pipeline_attributes) do { 'notes' => [ { @@ -66,7 +66,7 @@ } ] } - } + end it 'imports pipeline with notes' do expect(project.all_pipelines.first.notes.first.note).to include('test note') @@ -74,7 +74,7 @@ end context 'stages' do - let(:ci_pipeline_attributes) { + let(:ci_pipeline_attributes) do { 'stages' => [ { @@ -82,7 +82,7 @@ } ] } - } + end it 'imports pipeline with notes' do expect(project.all_pipelines.first.stages.first.name).to eq('test stage') -- GitLab From 2ebb67ea6ce6e7f039d307e79b20fae67913a034 Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 12:25:20 -0500 Subject: [PATCH 08/15] Fix rubocop complaints about indentation --- .../projects/pipelines/ci_pipelines_pipeline_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb index 0865c66afae9be..6254bc318d09d8 100644 --- a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb @@ -66,7 +66,7 @@ } ] } - end + end it 'imports pipeline with notes' do expect(project.all_pipelines.first.notes.first.note).to include('test note') @@ -82,7 +82,7 @@ } ] } - end + end it 'imports pipeline with notes' do expect(project.all_pipelines.first.stages.first.name).to eq('test stage') -- GitLab From b5b6d1fd89c769e9778fcc2d64120b96b7da483e Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 12:27:29 -0500 Subject: [PATCH 09/15] Rename pipeline stage --- lib/bulk_imports/projects/stage.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bulk_imports/projects/stage.rb b/lib/bulk_imports/projects/stage.rb index c13120c4e3211e..638acca2ab2414 100644 --- a/lib/bulk_imports/projects/stage.rb +++ b/lib/bulk_imports/projects/stage.rb @@ -43,14 +43,14 @@ def config pipeline: BulkImports::Projects::Pipelines::ProtectedBranchesPipeline, stage: 4 }, + ci_pipelines: { + pipeline: BulkImports::Projects::Pipelines::CiPipelinesPipeline, + stage: 4 + }, wiki: { pipeline: BulkImports::Common::Pipelines::WikiPipeline, stage: 5 }, - all_pipelines: { - pipeline: BulkImports::Projects::Pipelines::CiPipelinesPipeline, - stage: 4 - }, uploads: { pipeline: BulkImports::Common::Pipelines::UploadsPipeline, stage: 5 -- GitLab From 4008aa74e9ffb9be41079c67d685012eda55985a Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 14:31:52 -0500 Subject: [PATCH 10/15] Add in tests for - merge requests - external pull requests - stage/status - note events --- .../pipelines/ci_pipelines_pipeline_spec.rb | 77 ++++++++++++++++++- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb index 6254bc318d09d8..c404df13e4578f 100644 --- a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb @@ -42,6 +42,8 @@ allow(extractor).to receive(:extract).and_return(BulkImports::Pipeline::ExtractedData.new(data: [ci_pipeline])) end + allow(project.repository).to receive(:fetch_source_branch!) + pipeline.run end @@ -62,14 +64,22 @@ 'name' => 'User 22' }, 'commit_id' => 'fakesha', - 'updated_at' => '2016-06-14T15:02:47.770Z' + 'updated_at' => '2016-06-14T15:02:47.770Z', + 'events' => [ + { + 'action' => 'created', + 'author' => user + } + ] } ] } end it 'imports pipeline with notes' do - expect(project.all_pipelines.first.notes.first.note).to include('test note') + note = project.all_pipelines.first.notes.first + expect(note.note).to include('test note') + expect(note.events.first.action).to eq('created') end end @@ -78,14 +88,73 @@ { 'stages' => [ { - 'name' => 'test stage' + 'name' => 'test stage', + 'statuses' => [ + { + 'name' => 'first status', + 'status' => 'created' + } + ] } ] } end it 'imports pipeline with notes' do - expect(project.all_pipelines.first.stages.first.name).to eq('test stage') + stage = project.all_pipelines.first.stages.first + expect(stage.name).to eq('test stage') + expect(stage.statuses.first.name).to eq('first status') + end + end + + context 'external pull request' do + let(:ci_pipeline_attributes) do + { + 'source' => 'external_pull_request_event', + 'external_pull_request' => { + 'source_branch' => 'test source branch', + 'target_branch' => 'master', + 'source_sha' => 'testsha', + 'target_sha' => 'targetsha', + 'source_repository' => 'test repository', + 'target_repository' => 'test repository', + 'status' => 1, + 'pull_request_iid' => 1 + } + } + end + + it 'imports pipeline with external pull request' do + pull_request = project.all_pipelines.first.external_pull_request + expect(pull_request.source_branch).to eq('test source branch') + expect(pull_request.status).to eq('open').and_return(true) + end + end + + context 'merge request' do + let(:ci_pipeline_attributes) do + { + 'source' => 'merge_request_event', + 'merge_request' => { + 'description' => 'test merge request', + 'title' => 'test MR', + 'source_branch' => 'test source branch', + 'target_branch' => 'master', + 'source_sha' => 'testsha', + 'target_sha' => 'targetsha', + 'source_repository' => 'test repository', + 'target_repository' => 'test repository', + 'target_project' => project, + 'source_project' => project, + 'author' => user + } + } + end + + it 'imports pipeline with external pull request' do + merge_request = project.all_pipelines.first.merge_request + expect(merge_request.source_branch).to eq('test source branch') + expect(merge_request.description).to eq('test merge request') end end end -- GitLab From cae094e398faab54d307903753f1b9d3c8f3f92c Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 14:36:06 -0500 Subject: [PATCH 11/15] Test to ensure import preserves pipeline order --- .../pipelines/ci_pipelines_pipeline_spec.rb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb index c404df13e4578f..23848c81a04daa 100644 --- a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb @@ -29,6 +29,15 @@ }.merge(ci_pipeline_attributes) end + let(:ci_pipeline2) do + { + sha: "fakesha2", + ref: "fakeref2", + project: project, + source: "web" + }.merge(ci_pipeline_attributes) + end + let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) } let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) } @@ -39,7 +48,9 @@ group.add_owner(user) allow_next_instance_of(BulkImports::Common::Extractors::NdjsonExtractor) do |extractor| - allow(extractor).to receive(:extract).and_return(BulkImports::Pipeline::ExtractedData.new(data: [ci_pipeline])) + allow(extractor).to receive(:extract).and_return( + BulkImports::Pipeline::ExtractedData.new(data: [ci_pipeline, ci_pipeline2]) + ) end allow(project.repository).to receive(:fetch_source_branch!) @@ -48,7 +59,9 @@ end it 'imports Ci::Pipeline into destination project' do - expect(project.all_pipelines.count).to eq(1) + expect(project.all_pipelines.count).to eq(2) + expect(project.ci_pipelines.first.sha).to eq('fakesha') + expect(project.ci_pipelines.second.sha).to eq('fakesha2') end context 'notes' do -- GitLab From 21b100150562627d4b2b61efe1b216509cc4ec97 Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Wed, 10 Nov 2021 16:38:54 -0500 Subject: [PATCH 12/15] Fix tests after merge --- .../pipelines/ci_pipelines_pipeline_spec.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb index 23848c81a04daa..98a2e8b6a57215 100644 --- a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb +++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb @@ -53,7 +53,9 @@ ) end - allow(project.repository).to receive(:fetch_source_branch!) + allow_next_instance_of(Repository) do |repository| + allow(repository).to receive(:fetch_source_branch!) + end pipeline.run end @@ -81,7 +83,7 @@ 'events' => [ { 'action' => 'created', - 'author' => user + 'author_id' => 22 } ] } @@ -140,7 +142,7 @@ it 'imports pipeline with external pull request' do pull_request = project.all_pipelines.first.external_pull_request expect(pull_request.source_branch).to eq('test source branch') - expect(pull_request.status).to eq('open').and_return(true) + expect(pull_request.status).to eq('open') end end @@ -157,9 +159,9 @@ 'target_sha' => 'targetsha', 'source_repository' => 'test repository', 'target_repository' => 'test repository', - 'target_project' => project, - 'source_project' => project, - 'author' => user + 'target_project_id' => project.id, + 'source_project_id' => project.id, + 'author_id' => user.id } } end -- GitLab From e10115446292660633d10e6fadcd197d056dda74 Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Thu, 11 Nov 2021 15:23:48 -0500 Subject: [PATCH 13/15] Missed the EE project stage spec --- ee/spec/lib/ee/bulk_imports/projects/stage_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/ee/spec/lib/ee/bulk_imports/projects/stage_spec.rb b/ee/spec/lib/ee/bulk_imports/projects/stage_spec.rb index 4ac4c82bf37808..5af319d76ec024 100644 --- a/ee/spec/lib/ee/bulk_imports/projects/stage_spec.rb +++ b/ee/spec/lib/ee/bulk_imports/projects/stage_spec.rb @@ -15,6 +15,7 @@ [4, BulkImports::Projects::Pipelines::ExternalPullRequestsPipeline], [4, BulkImports::Projects::Pipelines::PushRulePipeline], [4, BulkImports::Projects::Pipelines::ProtectedBranchesPipeline], + [4, BulkImports::Projects::Pipelines::CiPipelinesPipeline], [5, BulkImports::Common::Pipelines::WikiPipeline], [5, BulkImports::Common::Pipelines::UploadsPipeline], [6, BulkImports::Common::Pipelines::EntityFinisher] -- GitLab From 4c478a561a8828f9762e87584dd6613382eec8c8 Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Thu, 18 Nov 2021 10:26:21 -0500 Subject: [PATCH 14/15] Update documentation --- doc/user/group/import/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md index 70406cfe8e85bb..136fc7b786343d 100644 --- a/doc/user/group/import/index.md +++ b/doc/user/group/import/index.md @@ -71,6 +71,7 @@ The following resources are migrated to the target instance: - image URL - Boards - Board Lists +- Pipelines Any other items are **not** migrated. -- GitLab From a6e0d18e0b2e746971dbdac7084f0fd481ec232b Mon Sep 17 00:00:00 2001 From: Allen Cook Date: Thu, 18 Nov 2021 12:04:39 -0500 Subject: [PATCH 15/15] Revert "Update documentation" This reverts commit 8a6653196fd614df8b0edb184a12f83f331efc23. --- doc/user/group/import/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md index 136fc7b786343d..70406cfe8e85bb 100644 --- a/doc/user/group/import/index.md +++ b/doc/user/group/import/index.md @@ -71,7 +71,6 @@ The following resources are migrated to the target instance: - image URL - Boards - Board Lists -- Pipelines Any other items are **not** migrated. -- GitLab