Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

2 files changed, 4 insertions, 3 deletions

diff --git a/spec/lib/gitlab/ci/templates/Jobs/sast_iac_latest_gitlab_ci_yaml_spec.rb b/spec/lib/gitlab/ci/templates/Jobs/sast_iac_latest_gitlab_ci_yaml_spec.rb
index 0f97bc06a4e..5ff179b6fee 100644
--- a/spec/lib/gitlab/ci/templates/Jobs/sast_iac_latest_gitlab_ci_yaml_spec.rb
+++ b/spec/lib/gitlab/ci/templates/Jobs/sast_iac_latest_gitlab_ci_yaml_spec.rb
@@ -36,9 +36,10 @@ RSpec.describe 'Jobs/SAST-IaC.latest.gitlab-ci.yml' do
       let(:merge_request) { create(:merge_request, :simple, source_project: project) }
       let(:pipeline) { service.execute(merge_request).payload }
 
-      it 'has no jobs' do
+      it 'creates a pipeline with the expected jobs' do
         expect(pipeline).to be_merge_request_event
-        expect(build_names).to be_empty
+        expect(pipeline.errors.full_messages).to be_empty
+        expect(build_names).to match_array(%w(kics-iac-sast))
       end
     end
 
diff --git a/spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb b/spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb
index 78d3982a79f..1a909f52ec3 100644
--- a/spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb
+++ b/spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe 'Auto-DevOps.gitlab-ci.yml' do
 
       context 'when the project is set for deployment to AWS' do
         let(:platform_value) { 'ECS' }
-        let(:review_prod_build_names) { build_names.select {|n| n.include?('review') || n.include?('production')} }
+        let(:review_prod_build_names) { build_names.select { |n| n.include?('review') || n.include?('production') } }
 
         before do
           create(:ci_variable, project: project, key: 'AUTO_DEVOPS_PLATFORM_TARGET', value: platform_value)