gitlab-qa 7.13.0 → 7.14.0

data/.gitlab-ci.yml

@@ -17,6 +17,7 @@ default:
     paths:
       - vendor/ruby
   before_script:
+    - echo $GITLAB_QA_OPTIONS
     - bundle version
     - bundle config path vendor
     - bundle install --jobs=$(nproc) --retry=3 --quiet && bundle check
@@ -108,52 +109,13 @@ rspec:
     - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi
     - exit $test_run_exit_code
 
-.ce-qa:
+.ce-variables:
   variables:
     DEFAULT_RELEASE: "CE"
-  rules:
-    # Don't run E2E jobs on release pipelines
-    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
-      changes: ["lib/**/version.rb"]
-      when: never
-    - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ee/'
-      when: never
-    - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/'
-      when: manual
-    - if: '$RELEASE =~ /gitlab-ce/ && $CI_JOB_NAME =~ /quarantine|custom/'
-      when: manual
-    - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/'
-      when: manual
-    - if: '$RELEASE == null || $RELEASE =~ /gitlab-ce/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
 
-.ee-qa:
+.ee-variables:
   variables:
     DEFAULT_RELEASE: "EE"
-  rules:
-    # Don't run E2E jobs on release pipelines
-    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
-      changes: ["lib/**/version.rb"]
-      when: never
-    - if: '$CI_COMMIT_TAG || $RELEASE =~ /gitlab-ce/'
-      when: never
-    - if: '$RELEASE == null && $CI_JOB_NAME =~ /quarantine|custom/'
-      when: manual
-    - if: '$RELEASE =~ /gitlab-ee/ && $CI_JOB_NAME =~ /quarantine|custom/'
-      when: manual
-    - if: '$CI_MERGE_REQUEST_ID && $CI_JOB_NAME =~ /quarantine|custom/'
-      when: manual
-    - if: '$RELEASE == null || $RELEASE =~ /gitlab-ee/ || $CI_MERGE_REQUEST_ID || $CI_COMMIT_REF_NAME == "master"'
-
-.only-qa:
-  rules:
-    # Don't run E2E jobs on release pipelines
-    - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab-qa" && $RELEASE == null'
-      changes: ["lib/**/version.rb"]
-      when: never
-    - if: '$CI_COMMIT_TAG || $RELEASE'
-      when: never
-    - if: '$RELEASE == null && $CI_JOB_NAME =~ /staging/'
-      when: manual
 
 .high-capacity:
   tags:
@@ -185,9 +147,10 @@ ce:sanity-framework:
   script:
     - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure"
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
 
 ee:sanity-framework:
   variables:
@@ -196,106 +159,154 @@ ee:sanity-framework:
   script:
     - ./bin/expect_exit_code_and_text "bundle exec exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag framework" 1 "2 examples, 1 failure"
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
 
 ce:custom-parallel:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
     - .rspec-report-opts
     - .no-issue-report-script
+    - .ce-variables
+
   allow_failure: true
   parallel: 10
 
 ee:custom-parallel:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
     - .no-issue-report-script
   allow_failure: true
   parallel: 10
 
-ce:instance:
+ce:instance-parallel:
   extends:
+    - .rules:ce-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .knapsack-variables
     - .rspec-report-opts
   parallel: 5
 
+ce:instance:
+  extends:
+    - .rules:ce-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+
 ce:instance-quarantine:
   extends:
+    - .rules:ce-qa
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ee:instance:
+ee:instance-parallel:
   extends:
+    - .rules:ee-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .knapsack-variables
     - .rspec-report-opts
   parallel: 5
 
+ee:instance:
+  extends:
+    - .rules:ee-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+
 ee:instance-quarantine:
   extends:
+    - .rules:ee-qa
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ce:relative_url:
+ce:relative_url-parallel:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .knapsack-variables
     - .rspec-report-opts
   parallel: 5
   variables:
     QA_SCENARIO: "Test::Instance::RelativeUrl"
 
+ce:relative_url:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Instance::RelativeUrl"
+
 ce:relative_url-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Instance::RelativeUrl"
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ee:relative_url:
+ee:relative_url-parallel:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .knapsack-variables
     - .rspec-report-opts
   parallel: 5
   variables:
     QA_SCENARIO: "Test::Instance::RelativeUrl"
 
+ee:relative_url:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Instance::RelativeUrl"
+
 ee:relative_url-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -304,18 +315,20 @@ ee:relative_url-quarantine:
 
 ce:repository_storage:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Instance::RepositoryStorage"
 
 ce:repository_storage-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -323,18 +336,20 @@ ce:repository_storage-quarantine:
 
 ee:repository_storage:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Instance::RepositoryStorage"
 
 ee:repository_storage-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -345,76 +360,109 @@ ce:image:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=CE}
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
-    - .ce-qa
+    - .ce-variables
 
 ee:image:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=EE}
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
-    - .ee-qa
+    - .ee-variables
 
-ce:update:
+ce:update-parallel:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
     - .knapsack-variables
     - .update-scenario-script
   parallel: 5
 
+ce:update:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
 ce:update-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
     - .update-scenario-script
   variables:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ee:update:
+ee:update-parallel:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
     - .knapsack-variables
     - .update-scenario-script
   parallel: 10
 
+ee:update:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
 ee:update-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
 # The Test::Omnibus::Upgrade scenario isn't run on master (because it always uses the latest CE/EE image) so we don't report the test results in issues
-ce:upgrade:
+ce:upgrade-parallel:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Upgrade CE -- $RSPEC_REPORT_OPTS
   extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .only-qa
     - .rspec-report-opts
     - .knapsack-variables
   parallel: 5
 
+ce:upgrade:
+  script:
+    - bundle exec exe/gitlab-qa Test::Omnibus::Upgrade CE -- $RSPEC_REPORT_OPTS
+  extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .rspec-report-opts
+
 ce:upgrade-quarantine:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Upgrade CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
   extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .only-qa
     - .quarantine
     - .rspec-report-opts
 
@@ -422,35 +470,37 @@ ee-previous-to-ce:update:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Update EE CE -- $RSPEC_REPORT_OPTS
   extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .only-qa
     - .rspec-report-opts
 
 ee-previous-to-ce:update-quarantine:
   script:
     - bundle exec exe/gitlab-qa Test::Omnibus::Update EE CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
   extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .only-qa
     - .quarantine
     - .rspec-report-opts
 
 ce:mattermost:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Mattermost"
 
 ce:mattermost-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -458,18 +508,20 @@ ce:mattermost-quarantine:
 
 ee:mattermost:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Mattermost"
 
 ee:mattermost-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -479,7 +531,8 @@ ee:mattermost-quarantine:
 # ee:geo:
 #   extends:
 #     - .test
-#     - .ee-qa
+#     - .ee-variables
+#     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
 #     - .rspec-report-opts
 #   variables:
 #     QA_SCENARIO: "Test::Integration::Geo"
@@ -487,7 +540,8 @@ ee:mattermost-quarantine:
 # ee:geo-quarantine:
 #   extends:
 #     - .test
-#     - .ee-qa
+#     - .ee-variables
+#     - .rules:ee-never-when-triggered-by-feature-flag-definition-change
 #     - .quarantine
 #     - .rspec-report-opts
 #   variables:
@@ -495,18 +549,20 @@ ee:mattermost-quarantine:
 
 ce:ldap_no_tls:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::LDAPNoTLS"
 
 ce:ldap_no_tls-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -514,18 +570,20 @@ ce:ldap_no_tls-quarantine:
 
 ee:ldap_no_tls:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::LDAPNoTLS"
 
 ee:ldap_no_tls-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -533,18 +591,20 @@ ee:ldap_no_tls-quarantine:
 
 ce:ldap_tls:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::LDAPTLS"
 
 ce:ldap_tls-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -552,18 +612,20 @@ ce:ldap_tls-quarantine:
 
 ee:ldap_tls:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::LDAPTLS"
 
 ee:ldap_tls-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -571,18 +633,20 @@ ee:ldap_tls-quarantine:
 
 ee:ldap_no_server:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::LDAPNoServer"
 
 ee:ldap_no_server-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -590,18 +654,20 @@ ee:ldap_no_server-quarantine:
 
 ce:instance_saml:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::InstanceSAML"
 
 ce:instance_saml-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -609,18 +675,20 @@ ce:instance_saml-quarantine:
 
 ee:instance_saml:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::InstanceSAML"
 
 ee:instance_saml-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -628,18 +696,20 @@ ee:instance_saml-quarantine:
 
 ee:group_saml:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GroupSAML"
 
 ee:group_saml-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -647,9 +717,10 @@ ee:group_saml-quarantine:
 
 ce:object_storage:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
   variables:
@@ -657,9 +728,10 @@ ce:object_storage:
 
 ce:object_storage-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
@@ -668,9 +740,10 @@ ce:object_storage-quarantine:
 
 ee:object_storage_aws:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
   variables:
@@ -679,9 +752,10 @@ ee:object_storage_aws:
 
 ee:object_storage_aws-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
@@ -691,9 +765,10 @@ ee:object_storage_aws-quarantine:
 
 ee:object_storage_gcs:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     GITLAB_QA_OPTS: "--omnibus-config object_storage_gcs"
@@ -701,9 +776,10 @@ ee:object_storage_gcs:
 
 ee:object_storage_gcs-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -712,9 +788,10 @@ ee:object_storage_gcs-quarantine:
 
 ee:object_storage:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
   variables:
@@ -723,9 +800,10 @@ ee:object_storage:
 
 ee:object_storage-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
@@ -735,9 +813,10 @@ ee:object_storage-quarantine:
 
 ee:packages:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
   variables:
@@ -746,9 +825,10 @@ ee:packages:
 
 ee:packages-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
     - .combined-gitlab-qa-options-script
@@ -758,18 +838,20 @@ ee:packages-quarantine:
 
 ce:object_storage_registry_tls:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::RegistryTLS --omnibus-config registry_object_storage"
 
 ce:object_storage_registry_tls-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -777,18 +859,20 @@ ce:object_storage_registry_tls-quarantine:
 
 ee:object_storage_registry_tls:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
+    - .ee-variables
     - .high-capacity
-    - .ee-qa
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::RegistryTLS --omnibus-config registry_object_storage"
 
 ee:object_storage_registry_tls-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -796,18 +880,20 @@ ee:object_storage_registry_tls-quarantine:
 
 ce:registry:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Registry"
 
 ce:registry-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -815,18 +901,20 @@ ce:registry-quarantine:
 
 ee:registry:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Registry"
 
 ee:registry-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -834,18 +922,20 @@ ee:registry-quarantine:
 
 ce:actioncable:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Actioncable"
 
 ce:actioncable-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -853,18 +943,20 @@ ce:actioncable-quarantine:
 
 ee:actioncable:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Actioncable"
 
 ee:actioncable-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -872,28 +964,31 @@ ee:actioncable-quarantine:
 
 ee:elasticsearch:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Elasticsearch"
 
 ee:elasticsearch-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Elasticsearch"
 
-ce:praefect:
+ce:praefect-parallel:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .knapsack-variables
     - .rspec-report-opts
   parallel: 5
@@ -901,11 +996,23 @@ ce:praefect:
     QA_SCENARIO: "Test::Integration::Praefect"
     QA_CAN_TEST_PRAEFECT: "true"
 
+ce:praefect:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Praefect"
+    QA_CAN_TEST_PRAEFECT: "true"
+
 ce:praefect-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -913,11 +1020,12 @@ ce:praefect-quarantine:
     QA_CAN_TEST_PRAEFECT: "true"
     QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
 
-ee:praefect:
+ee:praefect-parallel:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .knapsack-variables
     - .rspec-report-opts
   parallel: 10
@@ -925,11 +1033,23 @@ ee:praefect:
     QA_SCENARIO: "Test::Integration::Praefect"
     QA_CAN_TEST_PRAEFECT: "true"
 
+ee:praefect:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Praefect"
+    QA_CAN_TEST_PRAEFECT: "true"
+
 ee:praefect-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -939,18 +1059,20 @@ ee:praefect-quarantine:
 
 ce:gitaly-cluster:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
 
 ce:gitaly-cluster-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -958,18 +1080,20 @@ ce:gitaly-cluster-quarantine:
 
 ee:gitaly-cluster:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::GitalyCluster"
 
 ee:gitaly-cluster-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -977,52 +1101,58 @@ ee:gitaly-cluster-quarantine:
 
 ce:mtls:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::MTLS"
 
 ee:mtls:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::MTLS"
 
 ce:smtp:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::SMTP"
 
 ee:smtp:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::SMTP"
 
 ce:jira:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Jira"
 
 ce:jira-quarantine:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -1030,18 +1160,20 @@ ce:jira-quarantine:
 
 ee:jira:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_SCENARIO: "Test::Integration::Jira"
 
 ee:jira-quarantine:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .quarantine
     - .rspec-report-opts
   variables:
@@ -1049,18 +1181,20 @@ ee:jira-quarantine:
 
 ce:large-setup:
   extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ce-qa
+    - .ce-variables
     - .rspec-report-opts
   variables:
     QA_RSPEC_TAGS: "--tag can_use_large_setup"
 
 ee:large-setup:
   extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .ee-qa
+    - .ee-variables
     - .rspec-report-opts
   variables:
     QA_RSPEC_TAGS: "--tag can_use_large_setup"
@@ -1073,9 +1207,9 @@ staging:
     - 'echo "Running: bundle exec exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS"'
     - bundle exec exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS
   extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change
     - .test
     - .high-capacity
-    - .only-qa
   allow_failure: true
 
 generate_test_session:
@@ -1158,12 +1292,6 @@ notify_slack:
     - echo "TOP_UPSTREAM_SOURCE_JOB is $TOP_UPSTREAM_SOURCE_JOB"
     - 'bin/slack $NOTIFY_CHANNEL "☠️ QA against $RELEASE failed! ☠️ See the test session report: $(cat REPORT_ISSUE_URL), and pipeline: $CI_PIPELINE_URL (triggered from $TOP_UPSTREAM_SOURCE_JOB)" ci_failing'
 
-include:
-  - project: 'gitlab-org/quality/pipeline-common'
-    file: '/ci/gem-release.yml'
-  - project: 'gitlab-org/quality/pipeline-common'
-    file: '/ci/allure-report.yml'
-
 generate-allure-report:
   extends: .generate-allure-report-base
   stage: report
@@ -1195,3 +1323,10 @@ generate-allure-report:
       variables:
         ALLURE_JOB_NAME: package-and-qa
       when: always
+
+include:
+  - local: .gitlab/ci/*.gitlab-ci.yml
+  - project: 'gitlab-org/quality/pipeline-common'
+    file: '/ci/gem-release.yml'
+  - project: 'gitlab-org/quality/pipeline-common'
+    file: '/ci/allure-report.yml'