1 files changed, 7 insertions, 14 deletions
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb
index 412498476f0..f9113573295 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb
@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  # TODO: remove feature flag upon rollout completion
-  # FF rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/363186
-  RSpec.describe 'Verify', :runner, feature_flag: {
-    name: 'ci_docker_image_pull_policy',
-    scope: :global
-  } do
+  RSpec.describe 'Verify', :runner do
     describe 'Pipeline with image:pull_policy' do
       let(:runner_name) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(number: 8)}" }
       let(:job_name) { "test-job-#{pull_policies.join('-')}" }
@@ -27,10 +22,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(:ci_docker_image_pull_policy)
-        # Give the feature some time to switch
-        sleep(30)
-
         update_runner_policy(allowed_policies)
         add_ci_file
         Flow::Login.sign_in
@@ -39,12 +30,13 @@ module QA
       end
 
       after do
-        Runtime::Feature.disable(:ci_docker_image_pull_policy)
-
         runner.remove_via_api!
       end
 
-      context 'when policy is allowed' do
+      context(
+        'when policy is allowed',
+        quarantine: { type: :flaky, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/369397' }
+      ) do
         let(:allowed_policies) { %w[if-not-present always never] }
 
         where do
@@ -102,7 +94,8 @@ module QA
 
         it(
           'fails job with policy not allowed message',
-          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/368853'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/368853',
+          quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/371420', type: :stale }
         ) do
           visit_job