Merge branch 'add-feature-flag-tag-to-ui-variable-tests' into 'master'

Add feature_flag Tag to Verify UI Defined Variable Tests

See merge request gitlab-org/gitlab!85386

qa/qa/specs/features/browser_ui/4_verify/ci_variable/ui_variable_inheritable_when_forward_pipeline_variables_true_spec.rb

 # frozen_string_literal: true
 
 module QA
-  # Running with FF :ci_trigger_forward_variables
-  RSpec.describe 'Verify', :runner do
+  # TODO:
+  # Remove FF :ci_trigger_forward_variables
+  # when https://gitlab.com/gitlab-org/gitlab/-/issues/355572 is closed
+  RSpec.describe 'Verify', :runner, feature_flag: {
+    name: 'ci_trigger_forward_variables',
+    scope: :global
+  } do
     describe 'UI defined variable' do
       include_context 'variable inheritance test prep'
 

qa/qa/specs/features/browser_ui/4_verify/ci_variable/ui_variable_non_inheritable_when_forward_pipeline_variables_false_spec.rb

 # frozen_string_literal: true
 
 module QA
-  # Running with FF :ci_trigger_forward_variables
-  RSpec.describe 'Verify', :runner do
+  # TODO:
+  # Remove FF :ci_trigger_forward_variables
+  # when https://gitlab.com/gitlab-org/gitlab/-/issues/355572 is closed
+  RSpec.describe 'Verify', :runner, feature_flag: {
+    name: 'ci_trigger_forward_variables',
+    scope: :global
+  } do
     describe 'UI defined variable' do
       include_context 'variable inheritance test prep'
 

qa/spec/support/shared_contexts/variable_inheritance_shared_context.rb

 # frozen_string_literal: true
 
 module QA
-  # TODO:
-  # Remove FF :ci_trigger_forward_variables
-  # when https://gitlab.com/gitlab-org/gitlab/-/issues/355572 is closed
-  RSpec.shared_context 'variable inheritance test prep', feature_flag: {
-    name: 'ci_trigger_forward_variables',
-    scope: :global
-  } do
+  RSpec.shared_context 'variable inheritance test prep' do
     let(:random_string) { Faker::Alphanumeric.alphanumeric(number: 8) }
 
     let(:group) do