Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 21 insertions, 1 deletions

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 6a4be1fa072..78d3982a79f 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
@@ -238,14 +238,34 @@ RSpec.describe 'Auto-DevOps.gitlab-ci.yml' do
         end
 
         it_behaves_like 'pipeline with Kubernetes jobs'
+
+        context 'when certificate_based_clusters FF is disabled' do
+          before do
+            stub_feature_flags(certificate_based_clusters: false)
+          end
+
+          it 'does not include production job' do
+            expect(build_names).not_to include('production')
+          end
+        end
       end
 
-      context 'when project has an Agent is present' do
+      context 'when project has an Agent' do
         before do
           create(:cluster_agent, project: project)
         end
 
         it_behaves_like 'pipeline with Kubernetes jobs'
+
+        context 'when certificate_based_clusters FF is disabled' do
+          before do
+            stub_feature_flags(certificate_based_clusters: false)
+          end
+
+          it 'includes production job' do
+            expect(build_names).to include('production')
+          end
+        end
       end
     end