Add latest changes from gitlab-org/gitlab@master

2 files changed, 119 insertions, 8 deletions

diff --git a/spec/services/ci/create_pipeline_service/cross_project_pipeline_spec.rb b/spec/services/ci/create_pipeline_service/cross_project_pipeline_spec.rb
new file mode 100644
index 00000000000..9cf66dfceb0
--- /dev/null
+++ b/spec/services/ci/create_pipeline_service/cross_project_pipeline_spec.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ci::CreatePipelineService, '#execute' do
+  let_it_be(:group) { create(:group, name: 'my-organization') }
+  let(:upstream_project) { create(:project, :repository, name: 'upstream', group: group) }
+  let(:downstram_project) { create(:project, :repository, name: 'downstream', group: group) }
+  let(:user) { create(:user) }
+
+  let(:service) do
+    described_class.new(upstream_project, user, ref: 'master')
+  end
+
+  before do
+    upstream_project.add_developer(user)
+    downstram_project.add_developer(user)
+    create_gitlab_ci_yml(upstream_project, upstream_config)
+    create_gitlab_ci_yml(downstram_project, downstream_config)
+  end
+
+  context 'with resource group', :aggregate_failures do
+    let(:upstream_config) do
+      <<~YAML
+      instrumentation_test:
+        stage: test
+        resource_group: iOS
+        trigger:
+          project: my-organization/downstream
+          strategy: depend
+      YAML
+    end
+
+    let(:downstream_config) do
+      <<~YAML
+      test:
+        script: echo "Testing..."
+      YAML
+    end
+
+    it 'creates bridge job with resource group' do
+      pipeline = create_pipeline!
+
+      test = pipeline.statuses.find_by(name: 'instrumentation_test')
+      expect(pipeline).to be_created_successfully
+      expect(pipeline.triggered_pipelines).not_to be_exist
+      expect(upstream_project.resource_groups.count).to eq(1)
+      expect(test).to be_a Ci::Bridge
+      expect(test).to be_waiting_for_resource
+      expect(test.resource_group.key).to eq('iOS')
+    end
+
+    context 'when sidekiq processes the job', :sidekiq_inline do
+      it 'transitions to pending status and triggers a downstream pipeline' do
+        pipeline = create_pipeline!
+
+        test = pipeline.statuses.find_by(name: 'instrumentation_test')
+        expect(test).to be_pending
+        expect(pipeline.triggered_pipelines.count).to eq(1)
+      end
+
+      context 'when the resource is occupied by the other bridge' do
+        before do
+          resource_group = create(:ci_resource_group, project: upstream_project, key: 'iOS')
+          resource_group.assign_resource_to(create(:ci_build, project: upstream_project))
+        end
+
+        it 'stays waiting for resource' do
+          pipeline = create_pipeline!
+
+          test = pipeline.statuses.find_by(name: 'instrumentation_test')
+          expect(test).to be_waiting_for_resource
+          expect(pipeline.triggered_pipelines.count).to eq(0)
+        end
+      end
+    end
+  end
+
+  def create_pipeline!
+    service.execute(:push)
+  end
+
+  def create_gitlab_ci_yml(project, content)
+    project.repository.create_file(user, '.gitlab-ci.yml', content, branch_name: 'master', message: 'test')
+  end
+end
diff --git a/spec/services/ci/create_pipeline_service/parent_child_pipeline_spec.rb b/spec/services/ci/create_pipeline_service/parent_child_pipeline_spec.rb
index a3a616f0f64..a3818937113 100644
--- a/spec/services/ci/create_pipeline_service/parent_child_pipeline_spec.rb
+++ b/spec/services/ci/create_pipeline_service/parent_child_pipeline_spec.rb
@@ -84,21 +84,46 @@ RSpec.describe Ci::CreatePipelineService, '#execute' do
           stage: test
           resource_group: iOS
           trigger:
-            include:
-              - local: path/to/child.yml
+            include: path/to/child.yml
+            strategy: depend
         YAML
       end
 
-      # TODO: This test will be properly implemented in the next MR
-      # for https://gitlab.com/gitlab-org/gitlab/-/issues/39057.
-      it 'creates bridge job but still resource group is no-op', :aggregate_failures do
+      it 'creates bridge job with resource group', :aggregate_failures do
         pipeline = create_pipeline!
 
         test = pipeline.statuses.find_by(name: 'instrumentation_test')
-
-        expect(pipeline).to be_persisted
+        expect(pipeline).to be_created_successfully
+        expect(pipeline.triggered_pipelines).not_to be_exist
+        expect(project.resource_groups.count).to eq(1)
         expect(test).to be_a Ci::Bridge
-        expect(project.resource_groups.count).to eq(0)
+        expect(test).to be_waiting_for_resource
+        expect(test.resource_group.key).to eq('iOS')
+      end
+
+      context 'when sidekiq processes the job', :sidekiq_inline do
+        it 'transitions to pending status and triggers a downstream pipeline' do
+          pipeline = create_pipeline!
+
+          test = pipeline.statuses.find_by(name: 'instrumentation_test')
+          expect(test).to be_pending
+          expect(pipeline.triggered_pipelines.count).to eq(1)
+        end
+
+        context 'when the resource is occupied by the other bridge' do
+          before do
+            resource_group = create(:ci_resource_group, project: project, key: 'iOS')
+            resource_group.assign_resource_to(create(:ci_build, project: project))
+          end
+
+          it 'stays waiting for resource' do
+            pipeline = create_pipeline!
+
+            test = pipeline.statuses.find_by(name: 'instrumentation_test')
+            expect(test).to be_waiting_for_resource
+            expect(pipeline.triggered_pipelines.count).to eq(0)
+          end
+        end
       end
     end
   end