Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 17 deletions

diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb
index cedc2db2a1a..5a8aca9cd1e 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_multiple_files_from_a_project_spec.rb
@@ -3,9 +3,8 @@
 require 'faker'
 
 module QA
-  RSpec.describe 'Verify', :runner, :requires_admin, :skip_live_env do
-    describe "Include multiple files from a project" do
-      let(:feature_flag) { :ci_include_multiple_files_from_project }
+  RSpec.describe 'Verify', :runner do
+    describe 'Include multiple files from a project' do
       let(:executor) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" }
       let(:expected_text) { Faker::Lorem.sentence }
       let(:unexpected_text) { Faker::Lorem.sentence }
@@ -31,7 +30,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(feature_flag)
         Flow::Login.sign_in
         add_included_files
         add_main_ci_file
@@ -40,7 +38,6 @@ module QA
       end
 
       after do
-        Runtime::Feature.disable(feature_flag)
         runner.remove_via_api!
       end
 
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
index eafe28c1ee6..8512e34d758 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pass_dotenv_variables_to_downstream_via_bridge_spec.rb
@@ -3,9 +3,8 @@
 require 'faker'
 
 module QA
-  RSpec.describe 'Verify', :runner, :requires_admin do
-    describe "Pass dotenv variables to downstream via bridge" do
-      let(:feature_flag) { :ci_bridge_dependency_variables }
+  RSpec.describe 'Verify', :runner do
+    describe 'Pass dotenv variables to downstream via bridge' do
       let(:executor_1) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" }
       let(:executor_2) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" }
 
@@ -38,7 +37,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(feature_flag)
         Flow::Login.sign_in
         add_ci_file(downstream_project, downstream_ci_file)
         add_ci_file(upstream_project, upstream_ci_file)
@@ -47,7 +45,6 @@ module QA
       end
 
       after do
-        Runtime::Feature.disable(feature_flag)
         runner_1.remove_via_api!
         runner_2.remove_via_api!
       end
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb
index b79bda108af..5f3ec3ec870 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/run_pipeline_via_web_only_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Verify' do
-    describe 'Run pipeline', only: { subdomain: :staging } do
+    describe 'Run pipeline' do
       context 'with web only rule' do
         let(:job_name) { 'test_job' }
         let(:project) do
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb
index 2f66ed697a3..e621cfe239c 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb
@@ -3,11 +3,8 @@
 require 'faker'
 
 module QA
-  RSpec.describe 'Verify', :runner, :requires_admin do
-    # [TODO]: Developer to remove :requires_admin once FF is removed in follow up issue
-
+  RSpec.describe 'Verify', :runner do
     describe "Trigger child pipeline with 'when:manual'" do
-      let(:feature_flag) { :ci_manual_bridges } # [TODO]: Developer to remove when feature flag is removed
       let(:executor) { "qa-runner-#{Faker::Alphanumeric.alphanumeric(8)}" }
 
       let(:project) do
@@ -25,7 +22,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(feature_flag) # [TODO]: Developer to remove when feature flag is removed
         Flow::Login.sign_in
         add_ci_files
         project.visit!
@@ -33,7 +29,6 @@ module QA
       end
 
       after do
-        Runtime::Feature.disable(feature_flag) # [TODO]: Developer to remove when feature flag is removed
         runner.remove_via_api!
       end