Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 3 deletions

diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 3d2d8691c68..4c83f9229d9 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -914,6 +914,44 @@ describe Ci::CreatePipelineService do
       end
     end
 
+    context 'with resource group' do
+      context 'when resource group is defined' do
+        before do
+          config = YAML.dump(
+            test: { stage: 'test', script: 'ls', resource_group: resource_group_key }
+          )
+
+          stub_ci_pipeline_yaml_file(config)
+        end
+
+        let(:resource_group_key) { 'iOS' }
+
+        it 'persists the association correctly' do
+          result = execute_service
+          deploy_job = result.builds.find_by_name!(:test)
+          resource_group = project.resource_groups.find_by_key!(resource_group_key)
+
+          expect(result).to be_persisted
+          expect(deploy_job.resource_group.key).to eq(resource_group_key)
+          expect(project.resource_groups.count).to eq(1)
+          expect(resource_group.builds.count).to eq(1)
+          expect(resource_group.resources.count).to eq(1)
+          expect(resource_group.resources.first.build).to eq(nil)
+        end
+
+        context 'when resourc group key includes predefined variables' do
+          let(:resource_group_key) { '$CI_COMMIT_REF_NAME-$CI_JOB_NAME' }
+
+          it 'interpolates the variables into the key correctly' do
+            result = execute_service
+
+            expect(result).to be_persisted
+            expect(project.resource_groups.exists?(key: 'master-test')).to eq(true)
+          end
+        end
+      end
+    end
+
     context 'with timeout' do
       context 'when builds with custom timeouts are configured' do
         before do
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index b1368f7776b..76fe6f53a11 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -31,7 +31,7 @@ describe Ci::RetryBuildService do
        job_artifacts_container_scanning job_artifacts_dast
        job_artifacts_license_management job_artifacts_performance
        job_artifacts_codequality job_artifacts_metrics scheduled_at
-       job_variables].freeze
+       job_variables waiting_for_resource_at].freeze
 
   IGNORE_ACCESSORS =
     %i[type lock_version target_url base_tags trace_sections
@@ -40,14 +40,14 @@ describe Ci::RetryBuildService do
        user_id auto_canceled_by_id retried failure_reason
        sourced_pipelines artifacts_file_store artifacts_metadata_store
        metadata runner_session trace_chunks upstream_pipeline_id
-       artifacts_file artifacts_metadata artifacts_size commands].freeze
+       artifacts_file artifacts_metadata artifacts_size commands resource resource_group_id].freeze
 
   shared_examples 'build duplication' do
     let(:another_pipeline) { create(:ci_empty_pipeline, project: project) }
 
     let(:build) do
       create(:ci_build, :failed, :expired, :erased, :queued, :coverage, :tags,
-             :allowed_to_fail, :on_tag, :triggered, :teardown_environment,
+             :allowed_to_fail, :on_tag, :triggered, :teardown_environment, :resource_group,
              description: 'my-job', stage: 'test', stage_id: stage.id,
              pipeline: pipeline, auto_canceled_by: another_pipeline,
              scheduled_at: 10.seconds.since)