From aee0a117a889461ce8ced6fcf73207fe017f1d99 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Dec 2021 13:37:47 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-6-stable-ee

---
 .../api/1_manage/bulk_import_group_spec.rb         |  31 +++-
 .../api/1_manage/bulk_import_project_spec.rb       | 134 ---------------
 .../api/1_manage/import_github_repo_spec.rb        |   2 +-
 .../api/1_manage/import_large_github_repo_spec.rb  |   2 +-
 .../api/1_manage/project_access_token_spec.rb      |  21 ++-
 .../features/api/1_manage/rate_limits_spec.rb      |   2 +-
 .../api/1_manage/user_access_termination_spec.rb   |   6 +-
 qa/qa/specs/features/api/1_manage/users_spec.rb    |   6 +-
 .../closes_issue_via_pushing_a_commit_spec.rb      |   2 +-
 .../gitaly/automatic_failover_and_recovery_spec.rb |  13 +-
 .../3_create/gitaly/backend_node_recovery_spec.rb  |   4 +-
 .../gitaly/changing_repository_storage_spec.rb     |   4 +-
 .../api/3_create/gitaly/distributed_reads_spec.rb  |   5 +-
 .../api/3_create/gitaly/gitaly_mtls_spec.rb        |   2 +-
 .../gitaly/praefect_replication_queue_spec.rb      |  12 +-
 .../api/3_create/gitaly/praefect_repo_sync_spec.rb |   6 +-
 .../merge_request/push_options_labels_spec.rb      |  11 +-
 .../merge_request/push_options_mwps_spec.rb        |  28 +--
 .../push_options_remove_source_branch_spec.rb      |   2 +-
 .../push_options_target_branch_spec.rb             |   2 +-
 .../push_options_title_description_spec.rb         |   2 +-
 .../repository/default_branch_name_setting_spec.rb |   4 +-
 .../features/api/3_create/repository/files_spec.rb |   4 +-
 .../repository/project_archive_compare_spec.rb     |   2 +-
 .../repository/push_postreceive_idempotent_spec.rb |   4 +-
 .../snippet_repository_storage_move_spec.rb        |   2 +-
 .../cancel_pipeline_when_block_user_spec.rb        |   2 +-
 .../api/5_package/container_registry_spec.rb       |  20 ++-
 .../14_non_devops/performance_bar_spec.rb          |  38 ++++
 .../service_ping_default_enabled_spec.rb           |  22 +++
 .../14_non_devops/service_ping_disabled_spec.rb    |  22 +++
 .../1_manage/group/bulk_import_group_spec.rb       |   2 +-
 .../create_group_with_mattermost_team_spec.rb      |   2 +-
 .../1_manage/group/transfer_group_spec.rb          |   2 +-
 .../1_manage/group/transfer_project_spec.rb        |   2 +-
 .../browser_ui/1_manage/login/2fa_recovery_spec.rb |   2 +-
 .../1_manage/login/2fa_ssh_recovery_spec.rb        |   2 +-
 .../browser_ui/1_manage/login/log_in_spec.rb       |   2 +-
 .../1_manage/login/log_in_with_2fa_spec.rb         |   2 +-
 .../login/log_into_gitlab_via_ldap_spec.rb         |   2 +-
 .../login/log_into_mattermost_via_gitlab_spec.rb   |   2 +-
 .../login/login_via_instance_wide_saml_sso_spec.rb |   2 +-
 .../login/maintain_log_in_mixed_env_spec.rb        |   2 +-
 .../browser_ui/1_manage/login/register_spec.rb     |   8 +-
 .../1_manage/project/add_project_member_spec.rb    |   2 +-
 .../1_manage/project/create_project_spec.rb        |   4 +-
 .../1_manage/project/dashboard_images_spec.rb      |   4 +-
 .../1_manage/project/import_github_repo_spec.rb    |   2 +-
 .../1_manage/project/project_access_token_spec.rb  |   2 +-
 .../1_manage/project/view_project_activity_spec.rb |   2 +-
 .../1_manage/user/follow_user_activity_spec.rb     |   2 +-
 .../1_manage/user/user_access_termination_spec.rb  |   2 +-
 .../email/trigger_email_notification_spec.rb       |   2 +-
 .../2_plan/issue/check_mentions_for_xss_spec.rb    |   2 +-
 .../issue/collapse_comments_in_discussions_spec.rb |   2 +-
 .../browser_ui/2_plan/issue/comment_issue_spec.rb  |   2 +-
 .../browser_ui/2_plan/issue/create_issue_spec.rb   |  27 ++-
 .../2_plan/issue/custom_issue_template_spec.rb     |   2 +-
 .../browser_ui/2_plan/issue/export_as_csv_spec.rb  |   2 +-
 .../2_plan/issue/filter_issue_comments_spec.rb     |   2 +-
 .../2_plan/issue/issue_suggestions_spec.rb         |   2 +-
 .../2_plan/issue/jira_issue_import_spec.rb         |   2 +-
 .../browser_ui/2_plan/issue/mentions_spec.rb       |   2 +-
 .../2_plan/issue/real_time_assignee_spec.rb        |   2 +-
 .../2_plan/issue_boards/focus_mode_spec.rb         |   2 +-
 .../milestone/create_group_milestone_spec.rb       |   2 +-
 .../milestone/create_project_milestone_spec.rb     |   2 +-
 .../2_plan/related_issues/related_issues_spec.rb   |   2 +-
 .../2_plan/transient/comment_on_discussion_spec.rb |   2 +-
 .../design_management/add_design_content_spec.rb   |   2 +-
 .../archive_design_content_spec.rb                 |   2 +-
 .../modify_design_content_spec.rb                  |   2 +-
 .../3_create/jenkins/jenkins_build_status_spec.rb  |   2 +-
 .../3_create/jira/jira_basic_integration_spec.rb   |   4 +-
 .../cherry_pick/cherry_pick_a_merge_spec.rb        |   2 +-
 .../cherry_pick/cherry_pick_commit_spec.rb         |   2 +-
 .../merge_request/create_merge_request_spec.rb     |   4 +-
 .../create_merge_request_via_template_spec.rb      |   2 +-
 .../merge_merge_request_from_fork_spec.rb          |   2 +-
 .../merge_when_pipeline_succeeds_spec.rb           |   4 +-
 .../merge_request/rebase_merge_request_spec.rb     |   2 +-
 .../merge_request/revert/revert_commit_spec.rb     |   2 +-
 .../revert/reverting_merge_request_spec.rb         |   2 +-
 .../merge_request/squash_merge_request_spec.rb     |   2 +-
 .../suggestions/batch_suggestion_spec.rb           |   2 +-
 .../suggestions/custom_commit_suggestion_spec.rb   |   2 +-
 .../view_merge_request_diff_patch_spec.rb          |   4 +-
 .../view_merge_request_merge_ref_diff_spec.rb      |   4 +-
 .../repository/add_list_delete_branches_spec.rb    |   2 +-
 .../repository/branch_with_unusual_name_spec.rb    |   2 +-
 .../browser_ui/3_create/repository/clone_spec.rb   |   4 +-
 .../repository/file/create_file_via_web_spec.rb    |   2 +-
 .../repository/file/delete_file_via_web_spec.rb    |   2 +-
 .../repository/file/edit_file_via_web_spec.rb      |   2 +-
 .../repository/file/file_with_unusual_name_spec.rb |   2 +-
 .../repository/move_project_create_fork_spec.rb    |   2 +-
 .../repository/protocol_v2_push_http_spec.rb       |   2 +-
 .../repository/protocol_v2_push_ssh_spec.rb        |   2 +-
 .../repository/push_http_private_token_spec.rb     |   2 +-
 .../push_mirroring_lfs_over_http_spec.rb           |   4 +-
 .../repository/push_mirroring_over_http_spec.rb    |   4 +-
 .../repository/push_over_http_file_size_spec.rb    |   4 +-
 .../3_create/repository/push_over_http_spec.rb     |   4 +-
 .../3_create/repository/push_over_ssh_spec.rb      |   4 +-
 .../repository/push_protected_branch_spec.rb       |   4 +-
 .../3_create/repository/ssh_key_support_spec.rb    |   4 +-
 .../user_views_commit_diff_patch_spec.rb           |   4 +-
 .../clone_push_pull_personal_snippet_spec.rb       |   4 +-
 .../clone_push_pull_project_snippet_spec.rb        |   4 +-
 .../snippet/create_personal_snippet_spec.rb        |   2 +-
 ...te_personal_snippet_with_multiple_files_spec.rb |   2 +-
 .../snippet/create_project_snippet_spec.rb         |   2 +-
 ...ate_project_snippet_with_multiple_files_spec.rb |   2 +-
 .../3_create/snippet/share_snippet_spec.rb         |   4 +-
 .../web_ide/add_new_directory_in_web_ide_spec.rb   |   4 +-
 .../web_ide/create_first_file_in_web_ide_spec.rb   |   2 +-
 .../web_ide/link_to_line_in_web_ide_spec.rb        |   2 +-
 .../3_create/web_ide/open_fork_in_web_ide_spec.rb  |   4 +-
 .../web_ide/open_web_ide_from_diff_tab_spec.rb     |   2 +-
 .../3_create/web_ide/review_merge_request_spec.rb  |   2 +-
 .../web_ide/upload_new_file_in_web_ide_spec.rb     |   8 +-
 .../3_create/web_ide/web_terminal_spec.rb          |  14 +-
 .../3_create/wiki/content_editor_spec.rb           |   7 +-
 .../wiki/project_based_content_creation_spec.rb    |   8 +-
 .../project_based_content_manipulation_spec.rb     |   4 +-
 .../project_based_directory_management_spec.rb     |   2 +-
 .../3_create/wiki/project_based_list_spec.rb       |   4 +-
 .../wiki/project_based_page_deletion_spec.rb       |   2 +-
 .../ci_variable/add_remove_ci_variable_spec.rb     |   4 +-
 .../pipeline_with_protected_variable_spec.rb       |   4 +-
 .../pipeline/create_and_process_pipeline_spec.rb   |   2 +-
 ...e_local_config_file_paths_with_wildcard_spec.rb |   2 +-
 .../include_multiple_files_from_a_project_spec.rb  |   2 +-
 .../4_verify/pipeline/locked_artifacts_spec.rb     |   2 +-
 .../merge_mr_when_pipline_is_blocked_spec.rb       |   2 +-
 .../pipeline/mr_event_rule_pipeline_spec.rb        |   2 +-
 ...tenv_variables_to_downstream_via_bridge_spec.rb |   2 +-
 .../pipeline_editor_branch_switcher_spec.rb        |  87 +++++-----
 .../pipeline/run_pipeline_via_web_only_spec.rb     |   2 +-
 .../trigger_child_pipeline_with_manual_spec.rb     |   2 +-
 .../4_verify/pipeline/trigger_matrix_spec.rb       |   2 +-
 .../4_verify/runner/register_runner_spec.rb        |   2 +-
 .../4_verify/testing/view_code_coverage_spec.rb    |   2 +-
 .../container_registry_omnibus_spec.rb             | 191 +++++++++++----------
 .../container_registry/container_registry_spec.rb  |  18 +-
 .../online_garbage_collection_spec.rb              |  20 ++-
 .../dependency_proxy/dependency_proxy_spec.rb      |  54 +++---
 .../package_registry/composer_registry_spec.rb     |  29 ++--
 .../package_registry/conan_repository_spec.rb      |  46 ++---
 .../package_registry/generic_repository_spec.rb    |  28 +--
 .../package_registry/helm_registry_spec.rb         |  24 +--
 .../maven_gradle_repository_spec.rb                |  24 +--
 .../package_registry/maven_repository_spec.rb      |  58 ++++---
 .../npm/npm_instance_level_spec.rb                 |  44 ++---
 .../package_registry/npm/npm_project_level_spec.rb |  18 +-
 .../package_registry/nuget_repository_spec.rb      | 160 +++++++++--------
 .../package_registry/pypi_repository_spec.rb       | 108 ++++++------
 .../package_registry/rubygems_registry_spec.rb     | 172 ++++++++++---------
 .../6_release/deploy_key/add_deploy_key_spec.rb    |   2 +-
 .../deploy_token/add_deploy_token_spec.rb          |   8 +-
 .../6_release/pages/pages_pipeline_spec.rb         |   2 +-
 ..._child_pipelines_dependent_relationship_spec.rb |   4 +-
 ...hild_pipelines_independent_relationship_spec.rb |   4 +-
 .../create_project_with_auto_devops_spec.rb        |   2 +-
 .../kubernetes/kubernetes_integration_spec.rb      |   2 +-
 .../8_monitor/all_monitor_core_features_spec.rb    |  12 +-
 .../browser_ui/non_devops/performance_bar_spec.rb  |  38 ----
 167 files changed, 956 insertions(+), 948 deletions(-)
 delete mode 100644 qa/qa/specs/features/api/1_manage/bulk_import_project_spec.rb
 create mode 100644 qa/qa/specs/features/browser_ui/14_non_devops/performance_bar_spec.rb
 create mode 100644 qa/qa/specs/features/browser_ui/14_non_devops/service_ping_default_enabled_spec.rb
 create mode 100644 qa/qa/specs/features/browser_ui/14_non_devops/service_ping_disabled_spec.rb
 delete mode 100644 qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb

(limited to 'qa/qa/specs/features')

diff --git a/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb b/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
index 158881ed94c..799a5f7eaf2 100644
--- a/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/bulk_import_group_spec.rb
@@ -4,7 +4,7 @@ module QA
   # run only base UI validation on staging because test requires top level group creation which is problematic
   # on staging environment
   RSpec.describe 'Manage', :requires_admin, except: { subdomain: :staging } do
-    describe 'Bulk group import' do
+    describe 'Gitlab migration' do
       let(:import_wait_duration) { { max_duration: 300, sleep_interval: 2 } }
       let(:admin_api_client) { Runtime::API::Client.as_admin }
       let(:user) do
@@ -26,6 +26,7 @@ module QA
         Resource::Sandbox.fabricate_via_api! do |group|
           group.api_client = api_client
           group.path = "source-group-for-import-#{SecureRandom.hex(4)}"
+          group.avatar = File.new('qa/fixtures/designs/tanuki.jpg', 'r')
         end
       end
 
@@ -37,11 +38,19 @@ module QA
         end
       end
 
+      let(:import_failures) do
+        imported_group.import_details.sum([]) { |details| details[:failures] }
+      end
+
       before do
         sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
       end
 
-      after do
+      after do |example|
+        # Checking for failures in the test currently makes test very flaky due to catching unrelated failures
+        # Just log in case of failure until cause of network errors is found
+        # See: https://gitlab.com/gitlab-org/gitlab/-/issues/346500
+        Runtime::Logger.warn(import_failures) if example.exception && !import_failures.empty?
         user.remove_via_api!
       end
 
@@ -73,11 +82,13 @@ module QA
             label.group = subgroup
             label.title = "subgroup-#{SecureRandom.hex(4)}"
           end
+
+          imported_group # trigger import
         end
 
         it(
           'successfully imports groups and labels',
-          testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1873'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347674'
         ) do
           expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
 
@@ -108,11 +119,13 @@ module QA
             badge.link_url = "http://example.com/badge"
             badge.image_url = "http://shields.io/badge"
           end
+
+          imported_group # trigger import
         end
 
         it(
           'successfully imports group milestones and badges',
-          testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2245'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347628'
         ) do
           expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
 
@@ -139,6 +152,8 @@ module QA
         before do
           member.set_public_email
           source_group.add_member(member, Resource::Members::AccessLevel::DEVELOPER)
+
+          imported_group # trigger import
         end
 
         after do
@@ -147,14 +162,16 @@ module QA
 
         it(
           'adds members for imported group',
-          testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2310'
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347609'
         ) do
           expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
 
           imported_member = imported_group.reload!.members.find { |usr| usr.username == member.username }
 
-          expect(imported_member).not_to be_nil
-          expect(imported_member.access_level).to eq(Resource::Members::AccessLevel::DEVELOPER)
+          aggregate_failures do
+            expect(imported_member).not_to be_nil
+            expect(imported_member.access_level).to eq(Resource::Members::AccessLevel::DEVELOPER)
+          end
         end
       end
     end
diff --git a/qa/qa/specs/features/api/1_manage/bulk_import_project_spec.rb b/qa/qa/specs/features/api/1_manage/bulk_import_project_spec.rb
deleted file mode 100644
index 14c94e99446..00000000000
--- a/qa/qa/specs/features/api/1_manage/bulk_import_project_spec.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  # run only base UI validation on staging because test requires top level group creation which is problematic
-  # on staging environment
-  RSpec.describe 'Manage', :requires_admin, except: { subdomain: :staging } do
-    describe 'Bulk project import' do
-      let(:import_wait_duration) { { max_duration: 300, sleep_interval: 2 } }
-      let(:admin_api_client) { Runtime::API::Client.as_admin }
-      let(:user) do
-        Resource::User.fabricate_via_api! do |usr|
-          usr.api_client = admin_api_client
-          usr.hard_delete_on_api_removal = true
-        end
-      end
-
-      let(:api_client) { Runtime::API::Client.new(user: user) }
-
-      let(:sandbox) do
-        Resource::Sandbox.fabricate_via_api! do |group|
-          group.api_client = admin_api_client
-        end
-      end
-
-      let(:source_group) do
-        Resource::Sandbox.fabricate_via_api! do |group|
-          group.api_client = api_client
-          group.path = "source-group-for-import-#{SecureRandom.hex(4)}"
-        end
-      end
-
-      let(:source_project) do
-        Resource::Project.fabricate_via_api! do |project|
-          project.api_client = api_client
-          project.group = source_group
-          project.initialize_with_readme = true
-        end
-      end
-
-      let(:imported_group) do
-        Resource::BulkImportGroup.fabricate_via_api! do |group|
-          group.api_client = api_client
-          group.sandbox = sandbox
-          group.source_group_path = source_group.path
-        end
-      end
-
-      let(:imported_projects) do
-        imported_group.reload!.projects
-      end
-
-      let(:project_import_failures) do
-        imported_group.import_details
-          .find { |entity| entity[:destination_name] == source_project.name }
-          &.fetch(:failures)
-      end
-
-      before do
-        Runtime::Feature.enable(:bulk_import_projects)
-
-        sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
-
-        source_project.tap { |project| project.add_push_rules(member_check: true) } # fabricate source group and project
-      end
-
-      after do
-        user.remove_via_api!
-      ensure
-        Runtime::Feature.disable(:bulk_import_projects)
-      end
-
-      context 'with project' do
-        before do
-          imported_group # trigger import
-        end
-
-        it(
-          'successfully imports project',
-          testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2297'
-        ) do
-          expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
-          expect(imported_projects.count).to eq(1), "Expected to have 1 imported project"
-
-          aggregate_failures do
-            expect(imported_projects.first).to eq(source_project)
-            expect(project_import_failures).to be_empty, "Expected no errors, was: #{project_import_failures}"
-          end
-        end
-      end
-
-      context 'with project issues' do
-        let(:source_issue) do
-          Resource::Issue.fabricate_via_api! do |issue|
-            issue.api_client = api_client
-            issue.project = source_project
-            issue.labels = %w[label_one label_two]
-          end
-        end
-
-        let(:imported_issues) do
-          imported_projects.first.issues
-        end
-
-        let(:imported_issue) do
-          issue = imported_issues.first
-          Resource::Issue.init do |resource|
-            resource.api_client = api_client
-            resource.project = imported_projects.first
-            resource.iid = issue[:iid]
-          end
-        end
-
-        before do
-          source_issue # fabricate source group, project, issue
-          imported_group # trigger import
-        end
-
-        it(
-          'successfully imports issue',
-          testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2325'
-        ) do
-          expect { imported_group.import_status }.to eventually_eq('finished').within(import_wait_duration)
-          expect(imported_projects.count).to eq(1), "Expected to have 1 imported project"
-
-          aggregate_failures do
-            expect(imported_issues.count).to eq(1)
-            expect(imported_issue.reload!).to eq(source_issue)
-            expect(project_import_failures).to be_empty, "Expected no errors, was: #{project_import_failures}"
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb
index 744f39525b9..4bc95395f25 100644
--- a/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import_github_repo_spec.rb
@@ -30,7 +30,7 @@ module QA
         user.remove_via_api!
       end
 
-      it 'imports Github repo via api', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1878' do
+      it 'imports Github repo via api', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347670' do
         imported_project # import the project
 
         expect { imported_project.reload!.import_status }.to eventually_eq('finished').within(max_duration: 90)
diff --git a/qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb
index 3a2f960d812..c46de0ac514 100644
--- a/qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import_large_github_repo_spec.rb
@@ -121,7 +121,7 @@ module QA
 
       it(
         'imports large Github repo via api',
-        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1880'
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347668'
       ) do
         start = Time.now
 
diff --git a/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb b/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
index 47c07875257..13a795ca976 100644
--- a/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
@@ -4,17 +4,20 @@ module QA
   RSpec.describe 'Manage' do
     describe 'Project access token' do
       before(:all) do
-        @project_access_token = QA::Resource::ProjectAccessToken.fabricate_via_api!
+        @project_access_token = QA::Resource::ProjectAccessToken.fabricate_via_api! do |pat|
+          pat.project = Resource::ReusableProject.fabricate_via_api!
+        end
+
         @user_api_client = Runtime::API::Client.new(:gitlab, personal_access_token: @project_access_token.token)
       end
 
       context 'for the same project' do
-        it 'can be used to create a file via the project API', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1823' do
+        it 'can be used to create a file via the project API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347858' do
           expect do
             Resource::File.fabricate_via_api! do |file|
               file.api_client = @user_api_client
               file.project = @project_access_token.project
-              file.branch = 'new_branch'
+              file.branch = "new_branch_#{SecureRandom.hex(8)}"
               file.commit_message = 'Add new file'
               file.name = "text-#{SecureRandom.hex(8)}.txt"
               file.content = 'New file'
@@ -22,12 +25,12 @@ module QA
           end.not_to raise_error
         end
 
-        it 'can be used to commit via the API', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1822' do
+        it 'can be used to commit via the API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347859' do
           expect do
             Resource::Repository::Commit.fabricate_via_api! do |commit|
               commit.api_client = @user_api_client
               commit.project = @project_access_token.project
-              commit.branch = 'new_branch'
+              commit.branch = "new_branch_#{SecureRandom.hex(8)}"
               commit.start_branch = @project_access_token.project.default_branch
               commit.commit_message = 'Add new file'
               commit.add_files([
@@ -43,12 +46,12 @@ module QA
           @different_project = Resource::Project.fabricate!
         end
 
-        it 'cannot be used to create a file via the project API', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1821' do
+        it 'cannot be used to create a file via the project API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347860' do
           expect do
             Resource::File.fabricate_via_api! do |file|
               file.api_client = @user_api_client
               file.project = @different_project
-              file.branch = 'new_branch'
+              file.branch = "new_branch_#{SecureRandom.hex(8)}"
               file.commit_message = 'Add new file'
               file.name = "text-#{SecureRandom.hex(8)}.txt"
               file.content = 'New file'
@@ -56,12 +59,12 @@ module QA
           end.to raise_error(Resource::ApiFabricator::ResourceFabricationFailedError, /403 Forbidden/)
         end
 
-        it 'cannot be used to commit via the API', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1820' do
+        it 'cannot be used to commit via the API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347861' do
           expect do
             Resource::Repository::Commit.fabricate_via_api! do |commit|
               commit.api_client = @user_api_client
               commit.project = @different_project
-              commit.branch = 'new_branch'
+              commit.branch = "new_branch_#{SecureRandom.hex(8)}"
               commit.start_branch = @different_project.default_branch
               commit.commit_message = 'Add new file'
               commit.add_files([
diff --git a/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb b/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb
index 9eb1bd985ea..17ffb901e5a 100644
--- a/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/rate_limits_spec.rb
@@ -8,7 +8,7 @@ module QA
       let(:api_client) { Runtime::API::Client.new(:gitlab, ip_limits: true) }
       let(:request) { Runtime::API::Request.new(api_client, '/users') }
 
-      it 'GET /users', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1567' do
+      it 'GET /users', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347881' do
         5.times do
           get request.url
           expect_status(200)
diff --git a/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb b/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb
index a149c42877f..e47e5d22e5e 100644
--- a/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb
@@ -30,7 +30,7 @@ module QA
           @group.sandbox.remove_member(@user)
         end
 
-        it 'is not allowed to push code via the CLI', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1712' do
+        it 'is not allowed to push code via the CLI', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347863' do
           expect do
             Resource::Repository::Push.fabricate! do |push|
               push.repository_http_uri = @project.repository_http_location.uri
@@ -43,7 +43,7 @@ module QA
           end.to raise_error(QA::Support::Run::CommandError, /You are not allowed to push code to this project/)
         end
 
-        it 'is not allowed to create a file via the API', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1711' do
+        it 'is not allowed to create a file via the API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347864' do
           expect do
             Resource::File.fabricate_via_api! do |file|
               file.api_client = @user_api_client
@@ -56,7 +56,7 @@ module QA
           end.to raise_error(Resource::ApiFabricator::ResourceFabricationFailedError, /403 Forbidden/)
         end
 
-        it 'is not allowed to commit via the API', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1710' do
+        it 'is not allowed to commit via the API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347865' do
           expect do
             Resource::Repository::Commit.fabricate_via_api! do |commit|
               commit.api_client = @user_api_client
diff --git a/qa/qa/specs/features/api/1_manage/users_spec.rb b/qa/qa/specs/features/api/1_manage/users_spec.rb
index b705ce9e174..53587209bfb 100644
--- a/qa/qa/specs/features/api/1_manage/users_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/users_spec.rb
@@ -8,13 +8,13 @@ module QA
       let(:api_client) { Runtime::API::Client.new(:gitlab) }
       let(:request) { Runtime::API::Request.new(api_client, '/users') }
 
-      it 'GET /users', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1552' do
+      it 'GET /users', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347882' do
         get request.url
 
         expect_status(200)
       end
 
-      it 'GET /users/:username with a valid username', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1544' do
+      it 'GET /users/:username with a valid username', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347886' do
         get request.url, { params: { username: Runtime::User.username } }
 
         expect_status(200)
@@ -23,7 +23,7 @@ module QA
         )
       end
 
-      it 'GET /users/:username with an invalid username', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1551' do
+      it 'GET /users/:username with an invalid username', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347883' do
         get request.url, { params: { username: SecureRandom.hex(10) } }
 
         expect_status(200)
diff --git a/qa/qa/specs/features/api/2_plan/closes_issue_via_pushing_a_commit_spec.rb b/qa/qa/specs/features/api/2_plan/closes_issue_via_pushing_a_commit_spec.rb
index dabd97d69d0..073669f033c 100644
--- a/qa/qa/specs/features/api/2_plan/closes_issue_via_pushing_a_commit_spec.rb
+++ b/qa/qa/specs/features/api/2_plan/closes_issue_via_pushing_a_commit_spec.rb
@@ -22,7 +22,7 @@ module QA
         push_commit('Initial commit')
       end
 
-      it 'closes via pushing a commit', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1579' do
+      it 'closes via pushing a commit', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347947' do
         push_commit("Closes ##{issue_id}", false)
 
         Support::Retrier.retry_until(max_duration: 10, sleep_interval: 1) do
diff --git a/qa/qa/specs/features/api/3_create/gitaly/automatic_failover_and_recovery_spec.rb b/qa/qa/specs/features/api/3_create/gitaly/automatic_failover_and_recovery_spec.rb
index b85a0116f01..51927a30987 100644
--- a/qa/qa/specs/features/api/3_create/gitaly/automatic_failover_and_recovery_spec.rb
+++ b/qa/qa/specs/features/api/3_create/gitaly/automatic_failover_and_recovery_spec.rb
@@ -22,13 +22,11 @@ module QA
         end
       end
 
-      after(:context, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/238187', type: :stale }) do
-        # Leave the cluster in a suitable state for subsequent tests,
-        # if there was a problem during the tests here
+      after do
         praefect_manager.start_all_nodes
       end
 
-      it 'automatically fails over', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1267' do
+      it 'automatically fails over', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347830' do
         # Create a new project with a commit and wait for it to replicate
 
         # make sure that our project is published to the 'primary' node
@@ -44,10 +42,7 @@ module QA
           push.file_content = "This should exist on all nodes"
         end
 
-        praefect_manager.start_secondary_node
-        praefect_manager.start_tertiary_node
-        praefect_manager.wait_for_health_check_all_nodes
-
+        praefect_manager.start_all_nodes
         praefect_manager.wait_for_replication(project.id)
 
         # Stop the primary node to trigger failover, and then wait
@@ -76,7 +71,7 @@ module QA
       end
 
       context 'when recovering from dataloss after failover' do
-        it 'automatically reconciles', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/238187', type: :stale }, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1266' do
+        it 'automatically reconciles', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347831' do
           # Start the old primary node again
           praefect_manager.start_primary_node
           praefect_manager.wait_for_primary_node_health_check
diff --git a/qa/qa/specs/features/api/3_create/gitaly/backend_node_recovery_spec.rb b/qa/qa/specs/features/api/3_create/gitaly/backend_node_recovery_spec.rb
index 62437598f3b..25e860b4f6d 100644
--- a/qa/qa/specs/features/api/3_create/gitaly/backend_node_recovery_spec.rb
+++ b/qa/qa/specs/features/api/3_create/gitaly/backend_node_recovery_spec.rb
@@ -22,14 +22,14 @@ module QA
           praefect_manager.start_all_nodes
         end
 
-        it 'recovers from dataloss', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1265' do
+        it 'recovers from dataloss', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347832' do
           # Create a new project with a commit and wait for it to replicate
           praefect_manager.wait_for_replication(project.id)
 
           # Stop the primary node to trigger failover, and then wait
           # for Gitaly to be ready for writes again
           praefect_manager.stop_primary_node
-          praefect_manager.wait_for_gitaly_check
+          praefect_manager.wait_for_primary_node_health_check_failure
 
           # Push a commit to the new primary
           Resource::Repository::ProjectPush.fabricate! do |push|
diff --git a/qa/qa/specs/features/api/3_create/gitaly/changing_repository_storage_spec.rb b/qa/qa/specs/features/api/3_create/gitaly/changing_repository_storage_spec.rb
index a4251475e97..624ddbb68e1 100644
--- a/qa/qa/specs/features/api/3_create/gitaly/changing_repository_storage_spec.rb
+++ b/qa/qa/specs/features/api/3_create/gitaly/changing_repository_storage_spec.rb
@@ -24,7 +24,7 @@ module QA
         end
       end
 
-      context 'when moving from one Gitaly storage to another', :orchestrated, :repository_storage, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1270' do
+      context 'when moving from one Gitaly storage to another', :orchestrated, :repository_storage, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347827' do
         let(:source_storage) { { type: :gitaly, name: 'default' } }
         let(:destination_storage) { { type: :gitaly, name: QA::Runtime::Env.additional_repository_storage } }
         let(:project) do
@@ -45,7 +45,7 @@ module QA
       # Note: This test doesn't have the :orchestrated tag because it runs in the Test::Integration::Praefect
       # scenario with other tests that aren't considered orchestrated.
       # It also runs on staging using nfs-file07 as non-cluster storage and nfs-file22 as cluster/praefect storage
-      context 'when moving from Gitaly to Gitaly Cluster', :requires_praefect, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1269', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/284645', type: :investigating } do
+      context 'when moving from Gitaly to Gitaly Cluster', :requires_praefect, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347828', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/284645', type: :investigating } do
         let(:source_storage) { { type: :gitaly, name: QA::Runtime::Env.non_cluster_repository_storage } }
         let(:destination_storage) { { type: :praefect, name: QA::Runtime::Env.praefect_repository_storage } }
         let(:project) do
diff --git a/qa/qa/specs/features/api/3_create/gitaly/distributed_reads_spec.rb b/qa/qa/specs/features/api/3_create/gitaly/distributed_reads_spec.rb
index dfc2de02bf0..150378016e1 100644
--- a/qa/qa/specs/features/api/3_create/gitaly/distributed_reads_spec.rb
+++ b/qa/qa/specs/features/api/3_create/gitaly/distributed_reads_spec.rb
@@ -25,7 +25,7 @@ module QA
           praefect_manager.start_all_nodes
         end
 
-        it 'reads from each node', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1264' do
+        it 'reads from each node', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347833' do
           pre_read_data = praefect_manager.query_read_distribution
 
           wait_for_reads_to_increase(project, number_of_reads_per_loop, pre_read_data)
@@ -42,6 +42,7 @@ module QA
 
         context 'when a node is unhealthy' do
           before do
+            praefect_manager.start_all_nodes
             praefect_manager.stop_secondary_node
             praefect_manager.wait_for_secondary_node_health_check_failure
           end
@@ -51,7 +52,7 @@ module QA
             praefect_manager.start_all_nodes
           end
 
-          it 'does not read from the unhealthy node', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1263' do
+          it 'does not read from the unhealthy node', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347834' do
             pre_read_data = praefect_manager.query_read_distribution
 
             read_from_project(project, number_of_reads_per_loop * 10)
diff --git a/qa/qa/specs/features/api/3_create/gitaly/gitaly_mtls_spec.rb b/qa/qa/specs/features/api/3_create/gitaly/gitaly_mtls_spec.rb
index 237b8055d94..5000c273578 100644
--- a/qa/qa/specs/features/api/3_create/gitaly/gitaly_mtls_spec.rb
+++ b/qa/qa/specs/features/api/3_create/gitaly/gitaly_mtls_spec.rb
@@ -8,7 +8,7 @@ module QA
         let(:first_added_commit_message) { 'commit over git' }
         let(:second_added_commit_message) { 'commit over api' }
 
-        it 'pushes to gitaly', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1843' do
+        it 'pushes to gitaly', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347677' do
           project = Resource::Project.fabricate! do |project|
             project.name = "mTLS"
             project.initialize_with_readme = true
diff --git a/qa/qa/specs/features/api/3_create/gitaly/praefect_replication_queue_spec.rb b/qa/qa/specs/features/api/3_create/gitaly/praefect_replication_queue_spec.rb
index cd60f3fdf7c..e7e23124312 100644
--- a/qa/qa/specs/features/api/3_create/gitaly/praefect_replication_queue_spec.rb
+++ b/qa/qa/specs/features/api/3_create/gitaly/praefect_replication_queue_spec.rb
@@ -4,7 +4,7 @@ require 'parallel'
 
 module QA
   RSpec.describe 'Create' do
-    context 'Gitaly Cluster replication queue', :orchestrated, :gitaly_cluster, :skip_live_env do
+    context 'Gitaly Cluster replication queue', :orchestrated, :gitaly_cluster, :skip_live_env, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/346453', type: :flaky } do
       let(:praefect_manager) { Service::PraefectManager.new }
       let(:project) do
         Resource::Project.fabricate! do |project|
@@ -13,13 +13,18 @@ module QA
         end
       end
 
+      before do
+        praefect_manager.start_all_nodes
+        praefect_manager.start_praefect
+      end
+
       after do
+        praefect_manager.start_all_nodes
         praefect_manager.start_praefect
-        praefect_manager.wait_for_reliable_connection
         praefect_manager.clear_replication_queue
       end
 
-      it 'allows replication of different repository after interruption', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1268' do
+      it 'allows replication of different repository after interruption', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347829' do
         # We want to fill the replication queue with 10 `in_progress` jobs,
         # while a lock has been acquired, which is when the problem occurred
         # as reported in https://gitlab.com/gitlab-org/gitaly/-/issues/2801
@@ -51,7 +56,6 @@ module QA
         praefect_manager.create_stalled_replication_queue
 
         praefect_manager.start_praefect
-        praefect_manager.wait_for_reliable_connection
 
         # Create a new project, push to it, and check that replication occurs
         project_push = Resource::Repository::ProjectPush.fabricate! do |push|
diff --git a/qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb b/qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb
index 07ea7971396..cc49e408954 100644
--- a/qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb
+++ b/qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb
@@ -2,25 +2,27 @@
 
 module QA
   RSpec.describe 'Create' do
-    context 'Praefect repository commands', :orchestrated, :gitaly_cluster do
+    context 'Praefect repository commands', :orchestrated, :gitaly_cluster, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/347415', type: :investigating } do
       let(:praefect_manager) { Service::PraefectManager.new }
 
       let(:repo1) { { "relative_path" => "@hashed/repo1.git", "storage" => "gitaly1", "virtual_storage" => "default" } }
       let(:repo2) { { "relative_path" => "@hashed/path/to/repo2.git", "storage" => "gitaly3", "virtual_storage" => "default" } }
 
       before do
+        praefect_manager.start_all_nodes
         praefect_manager.add_repo_to_disk(praefect_manager.primary_node, repo1["relative_path"])
         praefect_manager.add_repo_to_disk(praefect_manager.tertiary_node, repo2["relative_path"])
       end
 
       after do
+        praefect_manager.start_all_nodes
         praefect_manager.remove_repo_from_disk(repo1["relative_path"])
         praefect_manager.remove_repo_from_disk(repo2["relative_path"])
         praefect_manager.remove_repository_from_praefect_database(repo1["relative_path"])
         praefect_manager.remove_repository_from_praefect_database(repo2["relative_path"])
       end
 
-      it 'allows admin to manage difference between praefect database and disk state', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2344' do
+      it 'allows admin to manage difference between praefect database and disk state', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347606' do
         # Some repos are on disk that praefect is not aware of
         untracked_repositories = praefect_manager.list_untracked_repositories
         expect(untracked_repositories).to include(repo1)
diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_labels_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_labels_spec.rb
index 26ca6de29f7..ab9af872753 100644
--- a/qa/qa/specs/features/api/3_create/merge_request/push_options_labels_spec.rb
+++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_labels_spec.rb
@@ -11,12 +11,7 @@ module QA
       let(:title) { "MR push options test #{SecureRandom.hex(8)}" }
       let(:commit_message) { 'Add README.md' }
 
-      let(:project) do
-        Resource::Project.fabricate_via_api! do |project|
-          project.name = 'merge-request-push-options'
-          project.initialize_with_readme = true
-        end
-      end
+      let(:project) { Resource::ReusableProject.fabricate_via_api! }
 
       def create_new_mr_via_push
         Resource::Repository::ProjectPush.fabricate! do |push|
@@ -31,7 +26,7 @@ module QA
         end
       end
 
-      it 'sets labels', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1244' do
+      it 'sets labels', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347839' do
         create_new_mr_via_push
 
         merge_request = project.merge_request_with_title(title)
@@ -45,7 +40,7 @@ module QA
           create_new_mr_via_push
         end
 
-        it 'removes them on subsequent push', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1243' do
+        it 'removes them on subsequent push', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347840' do
           Resource::Repository::ProjectPush.fabricate! do |push|
             push.project = project
             push.file_content = "Unlabel test #{SecureRandom.hex(8)}"
diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb
index 164507d8fca..83dcb163d56 100644
--- a/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb
+++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb
@@ -25,11 +25,12 @@ module QA
         end
       end
 
-      after do
+      after do |example|
         runner.remove_via_api!
+        project.remove_via_api! unless example.exception
       end
 
-      it 'sets merge when pipeline succeeds', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1240' do
+      it 'sets merge when pipeline succeeds', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347843' do
         Resource::Repository::Commit.fabricate_via_api! do |commit|
           commit.project = project
           commit.commit_message = 'Add .gitlab-ci.yml'
@@ -72,7 +73,7 @@ module QA
         expect(merge_request.merge_when_pipeline_succeeds).to be true
       end
 
-      it 'merges when pipeline succeeds', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1241' do
+      it 'merges when pipeline succeeds', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347842' do
         Resource::Repository::Commit.fabricate_via_api! do |commit|
           commit.project = project
           commit.commit_message = 'Add .gitlab-ci.yml'
@@ -106,15 +107,22 @@ module QA
         expect(merge_request).not_to be_nil, "There was a problem creating the merge request"
         expect(merge_request[:merge_when_pipeline_succeeds]).to be true
 
-        merge_request = Support::Waiter.wait_until(sleep_interval: 5) do
-          mr = Resource::MergeRequest.fabricate_via_api! do |mr|
-            mr.project = project
-            mr.iid = merge_request[:iid]
-          end
+        mr = nil
+        begin
+          merge_request = Support::Retrier.retry_until(max_duration: 60, sleep_interval: 5, message: 'The merge request was not merged') do
+            mr = Resource::MergeRequest.fabricate_via_api! do |mr|
+              mr.project = project
+              mr.iid = merge_request[:iid]
+            end
+
+            next unless mr.state == 'merged'
 
-          next unless mr.state == 'merged'
+            mr
+          end
+        rescue Support::Repeater::WaitExceededError
+          QA::Runtime::Logger.debug("MR: #{mr.api_response}")
 
-          mr
+          raise
         end
 
         expect(merge_request.state).to eq('merged')
diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb
index 32c7196e9fb..708dd7aa8af 100644
--- a/qa/qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb
+++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_remove_source_branch_spec.rb
@@ -17,7 +17,7 @@ module QA
         end
       end
 
-      it 'removes the source branch', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1242' do
+      it 'removes the source branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347841' do
         Resource::Repository::ProjectPush.fabricate! do |push|
           push.project = project
           push.branch_name = branch
diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb
index b0e616c2d1d..97d461c5113 100644
--- a/qa/qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb
+++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_target_branch_spec.rb
@@ -16,7 +16,7 @@ module QA
         end
       end
 
-      it 'sets a target branch', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1646' do
+      it 'sets a target branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347726' do
         target_branch = "push-options-test-target-#{SecureRandom.hex(8)}"
 
         Resource::Repository::ProjectPush.fabricate! do |push|
diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb
index c898646c0de..9d534e9ea6b 100644
--- a/qa/qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb
+++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_title_description_spec.rb
@@ -14,7 +14,7 @@ module QA
         end
       end
 
-      it 'sets title and description', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1239' do
+      it 'sets title and description', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347844' do
         description = "This is a test of MR push options"
         title = "MR push options test #{SecureRandom.hex(8)}"
 
diff --git a/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb b/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb
index b2a184c2374..cba563ef85a 100644
--- a/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb
@@ -11,7 +11,7 @@ module QA
         Runtime::ApplicationSettings.restore_application_settings(:default_branch_name)
       end
 
-      it 'sets the default branch name for a new project', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1247' do
+      it 'sets the default branch name for a new project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347837' do
         project = Resource::Project.fabricate_via_api! do |project|
           project.name = "default-branch-name"
           project.initialize_with_readme = true
@@ -30,7 +30,7 @@ module QA
         end
       end
 
-      it 'allows a project to be created via the CLI with a different default branch name', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1246' do
+      it 'allows a project to be created via the CLI with a different default branch name', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347838' do
         project_name = "default-branch-name-via-cli-#{SecureRandom.hex(8)}"
         group = Resource::Group.fabricate_via_api!
 
diff --git a/qa/qa/specs/features/api/3_create/repository/files_spec.rb b/qa/qa/specs/features/api/3_create/repository/files_spec.rb
index 4141b4343a0..48608094f5e 100644
--- a/qa/qa/specs/features/api/3_create/repository/files_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/files_spec.rb
@@ -11,7 +11,7 @@ module QA
     let(:project_name) { "api-basics-#{SecureRandom.hex(8)}" }
     let(:sanitized_project_path) { CGI.escape("#{Runtime::User.username}/#{project_name}") }
 
-    it 'user creates a project with a file and deletes them afterwards', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1581' do
+    it 'user creates a project with a file and deletes them afterwards', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347745' do
       create_project_request = Runtime::API::Request.new(@api_client, '/projects')
       post create_project_request.url, path: project_name, name: project_name
 
@@ -77,7 +77,7 @@ module QA
         SVG
       end
 
-      it 'sets no-cache headers as expected', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1580' do
+      it 'sets no-cache headers as expected', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347746' do
         create_project_request = Runtime::API::Request.new(@api_client, '/projects')
         post create_project_request.url, path: project_name, name: project_name
 
diff --git a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
index db75d4639ff..6f175272d91 100644
--- a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
@@ -27,7 +27,7 @@ module QA
         end
       end
 
-      it 'download archives of each user project then check they are different', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1575' do
+      it 'download archives of each user project then check they are different', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347748' do
         archive_checksums = {}
 
         users.each do |user_key, user_info|
diff --git a/qa/qa/specs/features/api/3_create/repository/push_postreceive_idempotent_spec.rb b/qa/qa/specs/features/api/3_create/repository/push_postreceive_idempotent_spec.rb
index 34254d579cb..1a2a1679cca 100644
--- a/qa/qa/specs/features/api/3_create/repository/push_postreceive_idempotent_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/push_postreceive_idempotent_spec.rb
@@ -17,11 +17,11 @@ module QA
         project&.remove_via_api!
       end
 
-      it 'pushes and creates a single push event three times', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1840' do
+      it 'pushes and creates a single push event three times', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347680' do
         verify_single_event_per_push(repeat: 3)
       end
 
-      it 'repeatedly pushes and creates a single push event several times', :transient, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1915' do
+      it 'repeatedly pushes and creates a single push event several times', :transient, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347642' do
         verify_single_event_per_push(repeat: Runtime::Env.transient_trials) do |i|
           QA::Runtime::Logger.info("Transient bug test action - Trial #{i}")
         end
diff --git a/qa/qa/specs/features/api/3_create/snippet/snippet_repository_storage_move_spec.rb b/qa/qa/specs/features/api/3_create/snippet/snippet_repository_storage_move_spec.rb
index 4b0dc9d431b..bfa408e1c92 100644
--- a/qa/qa/specs/features/api/3_create/snippet/snippet_repository_storage_move_spec.rb
+++ b/qa/qa/specs/features/api/3_create/snippet/snippet_repository_storage_move_spec.rb
@@ -21,7 +21,7 @@ module QA
         praefect_manager.gitlab = 'gitlab'
       end
 
-      it 'moves snippet repository from one Gitaly storage to another', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1912' do
+      it 'moves snippet repository from one Gitaly storage to another', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347645' do
         expect(snippet).to have_file('original_file')
         expect { snippet.change_repository_storage(destination_storage[:name]) }.not_to raise_error
         expect { praefect_manager.verify_storage_move(source_storage, destination_storage, repo_type: :snippet) }.not_to raise_error
diff --git a/qa/qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb b/qa/qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb
index 5d153e7736a..7c3fb9ebeba 100644
--- a/qa/qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb
+++ b/qa/qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb
@@ -34,7 +34,7 @@ module QA
         project.remove_via_api!
       end
 
-      it 'pipeline schedule is canceled', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1825' do
+      it 'pipeline schedule is canceled', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347999' do
         user.block!
 
         expect(pipeline_schedule[:active]).not_to be_truthy, "Expected schedule active state to be false - active state #{pipeline_schedule[:active]}"
diff --git a/qa/qa/specs/features/api/5_package/container_registry_spec.rb b/qa/qa/specs/features/api/5_package/container_registry_spec.rb
index 5847ffa1419..3a1a3ff7169 100644
--- a/qa/qa/specs/features/api/5_package/container_registry_spec.rb
+++ b/qa/qa/specs/features/api/5_package/container_registry_spec.rb
@@ -72,15 +72,17 @@ module QA
         registry&.remove_via_api!
       end
 
-      it 'pushes, pulls image to the registry and deletes image blob, manifest and tag', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1819' do
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.api_client = api_client
-          commit.commit_message = 'Add .gitlab-ci.yml'
-          commit.project = project
-          commit.add_files([{
-                                file_path: '.gitlab-ci.yml',
-                                content: gitlab_ci_yaml
-                            }])
+      it 'pushes, pulls image to the registry and deletes image blob, manifest and tag', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348001' do
+        Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.api_client = api_client
+            commit.commit_message = 'Add .gitlab-ci.yml'
+            commit.project = project
+            commit.add_files([{
+                                  file_path: '.gitlab-ci.yml',
+                                  content: gitlab_ci_yaml
+                              }])
+          end
         end
 
         Support::Waiter.wait_until(max_duration: 10) { pipeline_is_triggered? }
diff --git a/qa/qa/specs/features/browser_ui/14_non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/14_non_devops/performance_bar_spec.rb
new file mode 100644
index 00000000000..829d52b8e93
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/14_non_devops/performance_bar_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Non-devops' do
+    describe 'Performance bar display', :requires_admin, :skip_live_env do
+      context 'when logged in as an admin user' do
+        # performance metrics: pg, gitaly, redis, rugged (feature flagged), total (not always provided)
+        let(:minimum_metrics_count) { 3 }
+
+        before do
+          Flow::Login.sign_in_as_admin
+          Page::Main::Menu.perform(&:go_to_admin_area)
+          Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
+
+          Page::Admin::Settings::MetricsAndProfiling.perform do |setting|
+            setting.expand_performance_bar do |page|
+              page.enable_performance_bar
+              page.save_settings
+            end
+          end
+        end
+
+        it 'shows results for the original request and AJAX requests', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348030' do
+          # Issue pages always make AJAX requests
+          Resource::Issue.fabricate_via_browser_ui! do |issue|
+            issue.title = 'Performance bar test'
+          end
+
+          Page::Layout::PerformanceBar.perform do |bar_component|
+            expect(bar_component).to have_performance_bar
+            expect(bar_component).to have_detailed_metrics(minimum_metrics_count)
+            expect(bar_component).to have_request_for('realtime_changes') # Always requested on issue pages
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_default_enabled_spec.rb b/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_default_enabled_spec.rb
new file mode 100644
index 00000000000..ecc59aa7cc8
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_default_enabled_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Service ping default enabled' do
+    context 'When using default enabled from gitlab.yml config', :requires_admin do
+      before do
+        Flow::Login.sign_in_as_admin
+
+        Page::Main::Menu.perform(&:go_to_admin_area)
+        Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
+      end
+
+      it 'has service ping toggle enabled' do
+        Page::Admin::Settings::MetricsAndProfiling.perform do |setting|
+          setting.expand_usage_statistics do |page|
+            expect(page).not_to have_disabled_usage_data_checkbox
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_disabled_spec.rb b/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_disabled_spec.rb
new file mode 100644
index 00000000000..309369265c9
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/14_non_devops/service_ping_disabled_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Service ping disabled', :orchestrated, :service_ping_disabled, :requires_admin do
+    context 'when disabled from gitlab.yml config' do
+      before do
+        Flow::Login.sign_in_as_admin
+
+        Page::Main::Menu.perform(&:go_to_admin_area)
+        Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
+      end
+
+      it 'has service ping toggle is disabled' do
+        Page::Admin::Settings::MetricsAndProfiling.perform do |settings|
+          settings.expand_usage_statistics do |usage_statistics|
+            expect(usage_statistics).to have_disabled_usage_data_checkbox
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
index 15d51c14d26..74125b092b8 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
@@ -56,7 +56,7 @@ module QA
 
       it(
         'imports group from UI',
-        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1806',
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347862',
         issue_1: 'https://gitlab.com/gitlab-org/gitlab/-/issues/331252',
         issue_2: 'https://gitlab.com/gitlab-org/gitlab/-/issues/333678',
         issue_3: 'https://gitlab.com/gitlab-org/gitlab/-/issues/332351',
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
index eae8e1b7e12..4b2b49b8139 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/create_group_with_mattermost_team_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Configure', :orchestrated, :mattermost do
     describe 'Mattermost support' do
-      it 'user creates a group with a mattermost team', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1459' do
+      it 'user creates a group with a mattermost team', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347890' do
         Flow::Login.sign_in
         Page::Main::Menu.perform(&:go_to_groups)
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_group_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_group_spec.rb
index 2550fc86ef2..881bc5bc7c3 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_group_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_group_spec.rb
@@ -28,7 +28,7 @@ module QA
       end
 
       it 'transfers a subgroup to another group',
-         testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1828' do
+         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347692' do
         Page::Group::Menu.perform(&:click_group_general_settings_item)
         Page::Group::Settings::General.perform do |general|
           general.transfer_group(target_group.path)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
index 87ac136d802..ffd7a7dfb6c 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
@@ -44,7 +44,7 @@ module QA
       end
 
       it 'user transfers a project between groups',
-         testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1592' do
+         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347878' do
         # Retry is needed here as the target group is not avaliable for transfer right away.
         QA::Support::Retrier.retry_on_exception(reload_page: page) do
           Page::File::Show.perform(&:go_to_general_settings)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
index 4e15aa79623..5ba80489652 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
@@ -33,7 +33,7 @@ module QA
         group.add_member(developer_user, Resource::Members::AccessLevel::DEVELOPER)
       end
 
-      it 'allows using 2FA recovery code once only', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1271' do
+      it 'allows using 2FA recovery code once only', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347937' do
         recovery_code = enable_2fa_for_user_and_fetch_recovery_code(developer_user)
 
         Flow::Login.sign_in(as: developer_user, skip_page_validation: true)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb
index b97da194795..f85c07001e2 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/2fa_ssh_recovery_spec.rb
@@ -19,7 +19,7 @@ module QA
         enable_2fa_for_user(user)
       end
 
-      it 'allows 2FA code recovery via ssh', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1227' do
+      it 'allows 2FA code recovery via ssh', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347938' do
         recovery_code = Support::SSH.perform do |ssh|
           ssh.key = ssh_key
           ssh.uri = address.gsub(/(?<=:)(#{uri.port})/, ssh_port)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
index 9625771164c..98b5ecc8f0d 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Manage', :smoke, :mobile do
     describe 'basic user login' do
-      it 'user logs in using basic credentials and logs out', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1578' do
+      it 'user logs in using basic credentials and logs out', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347880' do
         Flow::Login.sign_in
 
         Page::Main::Menu.perform do |menu|
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
index 78fbec594a3..ca0ce0d5775 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
@@ -35,7 +35,7 @@ module QA
         group.add_member(developer_user, Resource::Members::AccessLevel::DEVELOPER)
       end
 
-      it 'allows enforcing 2FA via UI and logging in with 2FA', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1320' do
+      it 'allows enforcing 2FA via UI and logging in with 2FA', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347931' do
         enforce_two_factor_authentication_on_group(group)
 
         enable_two_factor_authentication_for_user(developer_user)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
index b4b1632dfbf..7ecad1101c9 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Manage', :orchestrated, :ldap_no_tls, :ldap_tls do
     describe 'LDAP login' do
-      it 'user logs into GitLab using LDAP credentials', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1456' do
+      it 'user logs into GitLab using LDAP credentials', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347892' do
         Flow::Login.sign_in
 
         Page::Main::Menu.perform do |menu|
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
index f06ded7ba53..6bfb9c96fbd 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_mattermost_via_gitlab_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Manage', :orchestrated, :mattermost do
     describe 'Mattermost login' do
-      it 'user logs into Mattermost using GitLab OAuth', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1458' do
+      it 'user logs into Mattermost using GitLab OAuth', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347891' do
         Flow::Login.sign_in
 
         Support::Retrier.retry_on_exception do
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/login_via_instance_wide_saml_sso_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/login_via_instance_wide_saml_sso_spec.rb
index e3b73906fe5..d6cb65c2788 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/login_via_instance_wide_saml_sso_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/login_via_instance_wide_saml_sso_spec.rb
@@ -5,7 +5,7 @@ module QA
     describe 'Instance wide SAML SSO' do
       it(
         'user logs in to gitlab with SAML SSO',
-        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1453'
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347895'
       ) do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/maintain_log_in_mixed_env_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/maintain_log_in_mixed_env_spec.rb
index 734529f319a..2c7656e20f1 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/maintain_log_in_mixed_env_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/maintain_log_in_mixed_env_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Manage', only: { subdomain: :staging }, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344213', type: :stale } do
     describe 'basic user' do
-      it 'remains logged in when redirected from canary to non-canary node', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2251' do
+      it 'remains logged in when redirected from canary to non-canary node', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347626' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
 
         Support::Retrier.retry_until(sleep_interval: 0.5) do
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
index 45d01d0f00a..16f8df5a90d 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -14,7 +14,7 @@ module QA
   end
 
   RSpec.describe 'Manage', :skip_signup_disabled, :requires_admin do
-    describe 'while LDAP is enabled', :orchestrated, :ldap_no_tls, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1300' do
+    describe 'while LDAP is enabled', :orchestrated, :ldap_no_tls, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347934' do
       before do
         # When LDAP is enabled, a previous test might have created a token for the LDAP 'tanuki' user who is not an admin
         # So we need to set it to nil in order to create a new token for admin user so that we are able to set_application_settings
@@ -39,7 +39,7 @@ module QA
       end
     end
 
-    describe 'standard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1652' do
+    describe 'standard', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347867' do
       context 'when admin approval is not required' do
         before(:all) do
           set_require_admin_approval_after_user_signup_via_api(false)
@@ -66,7 +66,7 @@ module QA
             end
           end
 
-          it 'allows recreating with same credentials', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1651' do
+          it 'allows recreating with same credentials', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347868' do
             expect(Page::Main::Menu.perform(&:signed_in?)).to be_falsy
 
             Flow::Login.sign_in(as: user, skip_page_validation: true)
@@ -106,7 +106,7 @@ module QA
           end
         end
 
-        it 'allows user login after approval', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1639' do
+        it 'allows user login after approval', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347871' do
           expect(page).to have_text(signed_up_waiting_approval_text)
 
           Flow::Login.sign_in(as: @user, skip_page_validation: true)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
index 3eb0a5457c0..6d09c8b1316 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
@@ -7,7 +7,7 @@ module QA
         Runtime::Feature.enable(:invite_members_group_modal)
       end
 
-      it 'user adds project member', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1543' do
+      it 'user adds project member', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347887' do
         Flow::Login.sign_in
 
         user = Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
index 34a7431e328..7f40818da03 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
@@ -22,7 +22,7 @@ module QA
         project
       end
 
-      context 'in group', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1620' do
+      context 'in group', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347876' do
         let(:project_name) { "project-in-group-#{SecureRandom.hex(8)}" }
         let(:project) do
           Resource::Project.fabricate_via_browser_ui! do |project|
@@ -34,7 +34,7 @@ module QA
         it_behaves_like 'successful project creation'
       end
 
-      context 'in personal namespace', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1914' do
+      context 'in personal namespace', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347643' do
         let(:project_name) { "project-in-personal-namespace-#{SecureRandom.hex(8)}" }
         let(:project) do
           Resource::Project.fabricate_via_browser_ui! do |project|
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/dashboard_images_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/dashboard_images_spec.rb
index e48a03b5661..2f9ceeb98eb 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/dashboard_images_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/dashboard_images_spec.rb
@@ -39,13 +39,13 @@ module QA
         end
       end
 
-      context 'when logged in as a new user', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1549' do
+      context 'when logged in as a new user', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347885' do
         it_behaves_like 'loads all images' do
           let(:new_user) { @new_user }
         end
       end
 
-      context 'when logged in as a new admin', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1550' do
+      context 'when logged in as a new admin', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347884' do
         it_behaves_like 'loads all images' do
           let(:new_user) { @new_admin }
         end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
index c078c4bf12e..72867333d16 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
@@ -38,7 +38,7 @@ module QA
         user.remove_via_api!
       end
 
-      it 'imports a GitHub repo', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1607' do
+      it 'imports a GitHub repo', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347877' do
         Page::Project::Import::Github.perform do |import_page|
           import_page.add_personal_access_token(Runtime::Env.github_access_token)
           import_page.import!(github_repo, group.full_path, imported_project.name)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/project_access_token_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/project_access_token_spec.rb
index dcf72c1cafc..be8567ee0b6 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/project_access_token_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/project_access_token_spec.rb
@@ -5,7 +5,7 @@ module QA
     describe 'Project access tokens' do
       let(:project_access_token) {QA::Resource::ProjectAccessToken.fabricate_via_browser_ui!}
 
-      it 'can be created and revoked via the UI', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1832' do
+      it 'can be created and revoked via the UI', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347688' do
         expect(project_access_token.token).not_to be_nil
 
         project_access_token.revoke_via_ui!
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb
index e5faebd2a80..1be73d92a8c 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/view_project_activity_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Manage' do
     describe 'Project activity' do
-      it 'user creates an event in the activity page upon Git push', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1591' do
+      it 'user creates an event in the activity page upon Git push', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347879' do
         Flow::Login.sign_in
 
         project = Resource::Repository::ProjectPush.fabricate! do |push|
diff --git a/qa/qa/specs/features/browser_ui/1_manage/user/follow_user_activity_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/user/follow_user_activity_spec.rb
index d0a57b95df4..43100929acd 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/user/follow_user_activity_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/user/follow_user_activity_spec.rb
@@ -61,7 +61,7 @@ module QA
         user_api_client.personal_access_token
       end
 
-      it 'can be followed and their activity seen', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1842' do
+      it 'can be followed and their activity seen', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347678' do
         Flow::Login.sign_in
         page.visit Runtime::Scenario.gitlab_address + "/#{user.username}"
         Page::User::Show.perform(&:click_follow_user_link)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/user/user_access_termination_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/user/user_access_termination_spec.rb
index 1158e65c3f3..58dcd922255 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/user/user_access_termination_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/user/user_access_termination_spec.rb
@@ -39,7 +39,7 @@ module QA
           end
         end
 
-        it 'is not allowed to edit the project files', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1709' do
+        it 'is not allowed to edit the project files', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347866' do
           Flow::Login.sign_in(as: user)
           project.visit!
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
index 27c16898c43..4350b8f0d3e 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
@@ -20,7 +20,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'is received by a user for project invitation', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1448' do
+      it 'is received by a user for project invitation', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347961' do
         project.visit!
 
         Page::Project::Menu.perform(&:click_members)
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
index 7c4e10dc2b3..c2b42de6701 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
@@ -33,7 +33,7 @@ module QA
         user&.remove_via_api!
       end
 
-      it 'mentions a user in a comment', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1559' do
+      it 'mentions a user in a comment', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347949' do
         Page::Project::Issue::Show.perform do |show|
           show.select_all_activities_filter
           show.comment("cc-ing you here @#{user.username}")
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
index 95272bae9c2..8e8112faa48 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
@@ -13,7 +13,7 @@ module QA
         issue.visit!
       end
 
-      it 'collapses and expands reply for comments in an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1189' do
+      it 'collapses and expands reply for comments in an issue', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347985' do
         Page::Project::Issue::Show.perform do |show|
           show.select_all_activities_filter
           show.start_discussion('My first discussion')
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
index b4df43cb235..3b02093054d 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
@@ -9,7 +9,7 @@ module QA
         Resource::Issue.fabricate_via_api!.visit!
       end
 
-      it 'comments on an issue and edits the comment', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1200' do
+      it 'comments on an issue and edits the comment', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347978' do
         Page::Project::Issue::Show.perform do |show|
           first_version_of_comment = 'First version of the comment'
           second_version_of_comment = 'Second version of the comment'
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index 81ae8b82ef6..eb4eb1d3e71 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -1,25 +1,32 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Plan', :smoke do
+  # TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed
+  RSpec.describe 'Plan', :smoke, :requires_admin do
     describe 'Issue creation' do
-      let(:closed_issue) { Resource::Issue.fabricate_via_api! }
+      let(:project) { Resource::Project.fabricate_via_api! }
+      let(:closed_issue) { Resource::Issue.fabricate_via_api! { |issue| issue.project = project } }
 
       before do
+        Runtime::Feature.enable(:vue_issues_list, group: project.group)
+
         Flow::Login.sign_in
       end
 
-      it 'creates an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1185' do
-        issue = Resource::Issue.fabricate_via_browser_ui!
+      it 'creates an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347989' do
+        issue = Resource::Issue.fabricate_via_browser_ui! { |issue| issue.project = project }
 
         Page::Project::Menu.perform(&:click_issues)
 
+        # TODO: Remove this method when the `Runtime::Feature.enable` method call is removed
+        Page::Project::Issue::Index.perform(&:wait_for_vue_issues_list_ff)
+
         Page::Project::Issue::Index.perform do |index|
           expect(index).to have_issue(issue)
         end
       end
 
-      it 'closes an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1222' do
+      it 'closes an issue', :mobile, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347967' do
         closed_issue.visit!
 
         Page::Project::Issue::Show.perform do |issue_page|
@@ -29,10 +36,14 @@ module QA
         end
 
         Page::Project::Menu.perform(&:click_issues)
+
+        # TODO: Remove this method when the `Runtime::Feature.enable` method call is removed
+        Page::Project::Issue::Index.perform(&:wait_for_vue_issues_list_ff)
+
         Page::Project::Issue::Index.perform do |index|
           expect(index).not_to have_issue(closed_issue)
 
-          index.click_closed_issues_link
+          index.click_closed_issues_tab
 
           expect(index).to have_issue(closed_issue)
         end
@@ -45,13 +56,13 @@ module QA
         end
 
         before do
-          Resource::Issue.fabricate_via_api!.visit!
+          Resource::Issue.fabricate_via_api! { |issue| issue.project = project }.visit!
         end
 
         # The following example is excluded from running in `review-qa-smoke` job
         # as it proved to be flaky when running against Review App
         # See https://gitlab.com/gitlab-com/www-gitlab-com/-/issues/11568#note_621999351
-        it 'comments on an issue with an attachment', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1599', except: { job: 'review-qa-smoke' } do
+        it 'comments on an issue with an attachment', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347946', except: { job: 'review-qa-smoke' } do
           Page::Project::Issue::Show.perform do |show|
             show.comment('See attached image for scale', attachment: file_to_attach)
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb
index 5ad590f4011..044cc118085 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/custom_issue_template_spec.rb
@@ -28,7 +28,7 @@ module QA
         end
       end
 
-      it 'creates an issue via custom template', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1612' do
+      it 'creates an issue via custom template', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347945' do
         Resource::Issue.fabricate_via_browser_ui! do |issue|
           issue.project = template_project
           issue.template = template_name
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
index 3914dbf4cd2..e8c624e9554 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/export_as_csv_spec.rb
@@ -22,7 +22,7 @@ module QA
         Page::Project::Menu.perform(&:click_issues)
       end
 
-      it 'successfully exports issues list as CSV', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1210' do
+      it 'successfully exports issues list as CSV', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347968' do
         Page::Project::Issue::Index.perform do |index|
           index.click_export_as_csv_button
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
index f31a8e69f83..c9536699cc5 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
@@ -9,7 +9,7 @@ module QA
         Resource::Issue.fabricate_via_api!.visit!
       end
 
-      it 'filters comments and activities in an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1577' do
+      it 'filters comments and activities in an issue', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347948' do
         Page::Project::Issue::Show.perform do |show|
           my_own_comment = "My own comment"
           made_the_issue_confidential = "made the issue confidential"
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/issue_suggestions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/issue_suggestions_spec.rb
index 8cef592029e..6bb338ae31f 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/issue_suggestions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/issue_suggestions_spec.rb
@@ -13,7 +13,7 @@ module QA
         end.project.visit!
       end
 
-      it 'shows issue suggestions when creating a new issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1179' do
+      it 'shows issue suggestions when creating a new issue', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347995' do
         Page::Project::Show.perform(&:go_to_new_issue)
         Page::Project::Issue::New.perform do |new_page|
           new_page.fill_title("issue")
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb
index 57ef09ab347..b7fa57a3270 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb
@@ -14,7 +14,7 @@ module QA
         end
       end
 
-      it 'imports issues from Jira', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1321' do
+      it 'imports issues from Jira', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347966' do
         set_up_jira_integration
         import_jira_issues
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
index 2d7fe6864aa..7d6718073f9 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
@@ -23,7 +23,7 @@ module QA
         end.visit!
       end
 
-      it 'mentions another user in an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1186' do
+      it 'mentions another user in an issue', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347988' do
         Page::Project::Issue::Show.perform do |show|
           at_username = "@#{user.username}"
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb
index 268ea975d32..45d466903de 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb
@@ -28,7 +28,7 @@ module QA
         Runtime::Feature.disable(:invite_members_group_modal, project: project)
       end
 
-      it 'update without refresh', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1644' do
+      it 'update without refresh', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347941' do
         issue = Resource::Issue.fabricate_via_api! do |issue|
           issue.project = project
           issue.assignee_ids = [user1.id]
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue_boards/focus_mode_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue_boards/focus_mode_spec.rb
index 63e707a4d27..f116c690eec 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue_boards/focus_mode_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue_boards/focus_mode_spec.rb
@@ -13,7 +13,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'focuses on issue board', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1178' do
+      it 'focuses on issue board', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347996' do
         project.visit!
 
         Page::Project::Menu.perform(&:go_to_boards)
diff --git a/qa/qa/specs/features/browser_ui/2_plan/milestone/create_group_milestone_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/milestone/create_group_milestone_spec.rb
index 9097dc07b04..22709e8fbc4 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/milestone/create_group_milestone_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/milestone/create_group_milestone_spec.rb
@@ -14,7 +14,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'creates a group milestone', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1203' do
+      it 'creates a group milestone', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347975' do
         group_milestone = Resource::GroupMilestone.fabricate_via_browser_ui! do |milestone|
           milestone.title = title
           milestone.description = description
diff --git a/qa/qa/specs/features/browser_ui/2_plan/milestone/create_project_milestone_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/milestone/create_project_milestone_spec.rb
index a6aee3e2b06..8047f8aea4c 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/milestone/create_project_milestone_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/milestone/create_project_milestone_spec.rb
@@ -14,7 +14,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'creates a project milestone', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1187' do
+      it 'creates a project milestone', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347987' do
         project_milestone = Resource::ProjectMilestone.fabricate_via_browser_ui! do |milestone|
           milestone.title = title
           milestone.description = description
diff --git a/qa/qa/specs/features/browser_ui/2_plan/related_issues/related_issues_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/related_issues/related_issues_spec.rb
index 2bb686c2694..85011415177 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/related_issues/related_issues_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/related_issues/related_issues_spec.rb
@@ -25,7 +25,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'relates and unrelates one issue to/from another', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1180' do
+      it 'relates and unrelates one issue to/from another', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347994' do
         issue_1.visit!
 
         Page::Project::Issue::Show.perform do |show|
diff --git a/qa/qa/specs/features/browser_ui/2_plan/transient/comment_on_discussion_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/transient/comment_on_discussion_spec.rb
index 6d73848b8f8..a3fe1d655aa 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/transient/comment_on_discussion_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/transient/comment_on_discussion_spec.rb
@@ -16,7 +16,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'comments with mention on a discussion in an issue', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1816' do
+      it 'comments with mention on a discussion in an issue', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347940' do
         Runtime::Env.transient_trials.times do |i|
           QA::Runtime::Logger.info("Transient bug test action - Trial #{i}")
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/design_management/add_design_content_spec.rb b/qa/qa/specs/features/browser_ui/3_create/design_management/add_design_content_spec.rb
index b26f2338f45..5f896c7bf10 100644
--- a/qa/qa/specs/features/browser_ui/3_create/design_management/add_design_content_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/design_management/add_design_content_spec.rb
@@ -12,7 +12,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'user adds a design and annotates it', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1290' do
+      it 'user adds a design and annotates it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347822' do
         issue.visit!
 
         Page::Project::Issue::Show.perform do |issue|
diff --git a/qa/qa/specs/features/browser_ui/3_create/design_management/archive_design_content_spec.rb b/qa/qa/specs/features/browser_ui/3_create/design_management/archive_design_content_spec.rb
index e7954cefffc..de7c95841d6 100644
--- a/qa/qa/specs/features/browser_ui/3_create/design_management/archive_design_content_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/design_management/archive_design_content_spec.rb
@@ -23,7 +23,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'user archives a design', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1812' do
+      it 'user archives a design', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347713' do
         third_design.issue.visit!
 
         Page::Project::Issue::Show.perform do |issue|
diff --git a/qa/qa/specs/features/browser_ui/3_create/design_management/modify_design_content_spec.rb b/qa/qa/specs/features/browser_ui/3_create/design_management/modify_design_content_spec.rb
index 7192e68d1cd..726e86ccdb4 100644
--- a/qa/qa/specs/features/browser_ui/3_create/design_management/modify_design_content_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/design_management/modify_design_content_spec.rb
@@ -13,7 +13,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'user adds a design and modifies it', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1813' do
+      it 'user adds a design and modifies it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347712' do
         design.issue.visit!
 
         Page::Project::Issue::Show.perform do |issue|
diff --git a/qa/qa/specs/features/browser_ui/3_create/jenkins/jenkins_build_status_spec.rb b/qa/qa/specs/features/browser_ui/3_create/jenkins/jenkins_build_status_spec.rb
index 245b33c6691..e5a6c57656e 100644
--- a/qa/qa/specs/features/browser_ui/3_create/jenkins/jenkins_build_status_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/jenkins/jenkins_build_status_spec.rb
@@ -25,7 +25,7 @@ module QA
         setup_jenkins
       end
 
-      it 'integrates and displays build status for MR pipeline in GitLab', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1410' do
+      it 'integrates and displays build status for MR pipeline in GitLab', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347788' do
         login_to_gitlab
 
         setup_project_integration_with_jenkins
diff --git a/qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb b/qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb
index b2efdb11e9a..088556a3981 100644
--- a/qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb
@@ -36,7 +36,7 @@ module QA
         expect(page).not_to have_text("Requests to the local network are not allowed")
       end
 
-      it 'closes an issue via pushing a commit', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1362' do
+      it 'closes an issue via pushing a commit', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347794' do
         issue_key = Vendor::Jira::JiraAPI.perform do |jira_api|
           jira_api.create_issue(jira_project_key)
         end
@@ -46,7 +46,7 @@ module QA
         expect_issue_done(issue_key)
       end
 
-      it 'closes an issue via a merge request', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1361' do
+      it 'closes an issue via a merge request', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347795' do
         issue_key = Vendor::Jira::JiraAPI.perform do |jira_api|
           jira_api.create_issue(jira_project_key)
         end
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_a_merge_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_a_merge_spec.rb
index 826c1a45ff4..413c530116c 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_a_merge_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_a_merge_spec.rb
@@ -22,7 +22,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'creates a merge request', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1836' do
+      it 'creates a merge request', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347684' do
         feature_mr.visit!
 
         Page::MergeRequest::Show.perform do |merge_request|
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_commit_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_commit_spec.rb
index b2e54680560..a1d8b495129 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_commit_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/cherry_pick/cherry_pick_commit_spec.rb
@@ -29,7 +29,7 @@ module QA
         commit.visit!
       end
 
-      it 'creates a merge request', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1817' do
+      it 'creates a merge request', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347710' do
         Page::Project::Commit::Show.perform(&:cherry_pick_commit)
         Page::MergeRequest::New.perform(&:create_merge_request)
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
index 79cc91acc79..6a2fe705cf7 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
@@ -19,7 +19,7 @@ module QA
       it(
         'creates a basic merge request',
         :smoke,
-        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1590'
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347738'
       ) do
         Resource::MergeRequest.fabricate_via_browser_ui! do |merge_request|
           merge_request.project = project
@@ -36,7 +36,7 @@ module QA
 
       it(
         'creates a merge request with a milestone and label',
-        testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1542'
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347762'
       ) do
         gitlab_account_username = "@#{Runtime::User.username}"
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb
index 01c75d95683..c4aacd8fb06 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb
@@ -29,7 +29,7 @@ module QA
         end
       end
 
-      it 'creates a merge request via custom template', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1680' do
+      it 'creates a merge request via custom template', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347722' do
         Resource::MergeRequest.fabricate_via_browser_ui! do |merge_request|
           merge_request.project = template_project
           merge_request.title = merge_request_title
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
index f2d4fc6e677..d198d79c5fe 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
@@ -17,7 +17,7 @@ module QA
         merge_request.fork.remove_via_api!
       end
 
-      it 'can merge feature branch fork to mainline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1305' do
+      it 'can merge feature branch fork to mainline', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347818' do
         merge_request.visit!
 
         Page::MergeRequest::Show.perform do |merge_request|
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
index 3a5850c0047..9a771919c11 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb
@@ -87,11 +87,11 @@ module QA
         end
       end
 
-      context 'when merging once', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1834' do
+      context 'when merging once', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347686' do
         it_behaves_like 'merge when pipeline succeeds'
       end
 
-      context 'when merging several times', :transient, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1917' do
+      context 'when merging several times', :transient, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347641' do
         it_behaves_like 'merge when pipeline succeeds', repeat: Runtime::Env.transient_trials
       end
     end
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
index 81fb187df85..536abfa5303 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
@@ -9,7 +9,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'user rebases source branch of merge request', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1596' do
+      it 'user rebases source branch of merge request', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347735' do
         merge_request.project.visit!
 
         Page::Project::Menu.perform(&:go_to_general_settings)
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/revert_commit_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/revert_commit_spec.rb
index a24ba9ac45a..a2b27e294e6 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/revert_commit_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/revert_commit_spec.rb
@@ -27,7 +27,7 @@ module QA
         commit.visit!
       end
 
-      it 'creates a merge request', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1807' do
+      it 'creates a merge request', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347716' do
         Page::Project::Commit::Show.perform(&:revert_commit)
         Page::MergeRequest::New.perform(&:create_merge_request)
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb
index 6a79a2d8078..90ca836f8b0 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb
@@ -19,7 +19,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'can be reverted', :can_use_large_setup, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1818', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/335987', type: :investigating } do
+      it 'can be reverted', :can_use_large_setup, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347709', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/335987', type: :investigating } do
         revertable_merge_request.visit!
 
         Page::MergeRequest::Show.perform do |merge_request|
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
index 9fcf6b3db71..fa129f39a4c 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
@@ -31,7 +31,7 @@ module QA
         merge_request.visit!
       end
 
-      it 'user squashes commits while merging', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1583' do
+      it 'user squashes commits while merging', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347744' do
         Page::MergeRequest::Show.perform do |merge_request_page|
           merge_request_page.retry_on_exception(reload: true) do
             expect(merge_request_page).to have_text('to be squashed')
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb
index 96c9c9b55b4..38adf2f5d55 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb
@@ -46,7 +46,7 @@ module QA
         merge_request.visit!
       end
 
-      it 'applies multiple suggestions', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1838' do
+      it 'applies multiple suggestions', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347682' do
         Page::MergeRequest::Show.perform do |merge_request|
           merge_request.click_diffs_tab
           4.times { merge_request.add_suggestion_to_batch }
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/custom_commit_suggestion_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/custom_commit_suggestion_spec.rb
index 719006e87eb..d73fb57a581 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/custom_commit_suggestion_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/custom_commit_suggestion_spec.rb
@@ -43,7 +43,7 @@ module QA
         merge_request.visit!
       end
 
-      it 'applies a single suggestion with a custom message', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1815' do
+      it 'applies a single suggestion with a custom message', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347711' do
         Page::MergeRequest::Show.perform do |merge_request|
           merge_request.click_diffs_tab
           merge_request.apply_suggestion_with_message(commit_message)
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
index fb30d47135e..18aa6bfe78a 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
@@ -15,7 +15,7 @@ module QA
         merge_request.visit!
       end
 
-      it 'views the merge request email patches', :can_use_large_setup, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1585' do
+      it 'views the merge request email patches', :can_use_large_setup, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347742' do
         Page::MergeRequest::Show.perform(&:view_email_patches)
 
         expect(page.text).to start_with('From')
@@ -23,7 +23,7 @@ module QA
         expect(page).to have_content("diff --git a/#{merge_request.file_name} b/#{merge_request.file_name}")
       end
 
-      it 'views the merge request plain diff', :can_use_large_setup, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1584' do
+      it 'views the merge request plain diff', :can_use_large_setup, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347743' do
         Page::MergeRequest::Show.perform(&:view_plain_diff)
 
         expect(page.text).to start_with('diff')
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_merge_ref_diff_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_merge_ref_diff_spec.rb
index c7942c5c2e4..0785b32b225 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_merge_ref_diff_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_merge_ref_diff_spec.rb
@@ -32,7 +32,7 @@ module QA
           merge_request.visit!
         end
 
-        it 'views the merge-ref diff by default', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1902' do
+        it 'views the merge-ref diff by default', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347651' do
           Page::MergeRequest::Show.perform do |mr_page|
             mr_page.click_diffs_tab
             mr_page.click_target_version_dropdown
@@ -57,7 +57,7 @@ module QA
           merge_request.visit!
         end
 
-        it 'views the merge-base diff by default', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1903' do
+        it 'views the merge-base diff by default', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347650' do
           Page::MergeRequest::Show.perform do |mr_page|
             mr_page.click_diffs_tab
             mr_page.click_target_version_dropdown
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb
index 9448cd13f53..a98925eab98 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb
@@ -61,7 +61,7 @@ module QA
         project.visit!
       end
 
-      it 'lists branches correctly after CRUD operations', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1588' do
+      it 'lists branches correctly after CRUD operations', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347740' do
         Page::Project::Menu.perform(&:go_to_repository_branches)
 
         expect(page).to have_content(master_branch)
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb
index 39fb18f2051..9e77fd228da 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/branch_with_unusual_name_spec.rb
@@ -16,7 +16,7 @@ module QA
       end
 
       context 'when branch name contains slash, hash, double dash, and capital letter' do
-        it 'renders repository file tree correctly', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1809' do
+        it 'renders repository file tree correctly', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347715' do
           Resource::Repository::Commit.fabricate_via_api! do |commit|
             commit.project = project
             commit.branch = branch_name
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
index 1fa95eda3f0..d12fb05af77 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
@@ -28,7 +28,7 @@ module QA
         project.wait_for_push_new_branch
       end
 
-      it 'user performs a deep clone', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1546' do
+      it 'user performs a deep clone', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347761' do
         Git::Repository.perform do |repository|
           repository.uri = project.repository_http_location.uri
           repository.use_default_credentials
@@ -39,7 +39,7 @@ module QA
         end
       end
 
-      it 'user performs a shallow clone', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1589' do
+      it 'user performs a shallow clone', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347739' do
         Git::Repository.perform do |repository|
           repository.uri = project.repository_http_location.uri
           repository.use_default_credentials
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/file/create_file_via_web_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/file/create_file_via_web_spec.rb
index 6d7e1b4f6df..f335cfdb367 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/file/create_file_via_web_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/file/create_file_via_web_spec.rb
@@ -11,7 +11,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'user creates a file via the Web', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1633' do
+      it 'user creates a file via the Web', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347729' do
         Resource::File.fabricate_via_browser_ui! do |file|
           file.name = file_name
           file.content = file_content
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/file/delete_file_via_web_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/file/delete_file_via_web_spec.rb
index 4667dccb9a1..02ecff22840 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/file/delete_file_via_web_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/file/delete_file_via_web_spec.rb
@@ -12,7 +12,7 @@ module QA
         file.visit!
       end
 
-      it 'user deletes a file via the Web', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1631' do
+      it 'user deletes a file via the Web', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347731' do
         Page::File::Show.perform do |file|
           file.click_delete
           file.add_commit_message(commit_message_for_delete)
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/file/edit_file_via_web_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/file/edit_file_via_web_spec.rb
index 47aebcbf349..25c095d9eda 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/file/edit_file_via_web_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/file/edit_file_via_web_spec.rb
@@ -13,7 +13,7 @@ module QA
         file.visit!
       end
 
-      it 'user edits a file via the Web', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1632' do
+      it 'user edits a file via the Web', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347730' do
         Page::File::Show.perform(&:click_edit)
 
         Page::File::Form.perform do |file|
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/file/file_with_unusual_name_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/file/file_with_unusual_name_spec.rb
index 0a01afd97d8..6caa8e64d56 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/file/file_with_unusual_name_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/file/file_with_unusual_name_spec.rb
@@ -16,7 +16,7 @@ module QA
       end
 
       context 'when file name starts with a dash and contains hash, semicolon, colon, and question mark' do
-        it 'renders repository file tree correctly', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1810' do
+        it 'renders repository file tree correctly', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347714' do
           Resource::File.fabricate_via_api! do |file|
             file.project = project
             file.commit_message = 'Add new file'
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb
index a53bb197b09..bec95e41202 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb
@@ -23,7 +23,7 @@ module QA
         parent_project.add_member(user)
       end
 
-      it 'creates a 2nd fork after moving the parent project', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1413' do
+      it 'creates a 2nd fork after moving the parent project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347787' do
         Flow::Login.sign_in(as: user)
 
         fork_project.visit!
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb
index 48bfe56e91e..34439042796 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Create' do
     describe 'Push over HTTP using Git protocol version 2', :requires_git_protocol_v2 do
-      it 'user pushes to the repository', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1548' do
+      it 'user pushes to the repository', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347760' do
         Flow::Login.sign_in
 
         # Create a project to push to
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb
index 467d9b2487d..25d4da95dd9 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb
@@ -27,7 +27,7 @@ module QA
         Page::Main::Menu.perform(&:sign_out_if_signed_in)
       end
 
-      it 'user pushes to the repository', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1606' do
+      it 'user pushes to the repository', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347734' do
         project = Resource::Project.fabricate_via_api! do |project|
           project.name = 'git-protocol-project'
         end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
index 6fdf7f424ee..042fee38188 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Create' do
     describe 'Git push over HTTP', :smoke do
-      it 'user using a personal access token pushes code to the repository', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1573' do
+      it 'user using a personal access token pushes code to the repository', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347749' do
         Flow::Login.sign_in
 
         access_token = Resource::PersonalAccessToken.fabricate!.token
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb
index d8972d4f37a..b8e425ae3b8 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_lfs_over_http_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Create' do
     describe 'Push mirror a repository over HTTP' do
-      it 'configures and syncs LFS objects for a (push) mirrored repository', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1224' do
+      it 'configures and syncs LFS objects for a (push) mirrored repository', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347847' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)
 
@@ -30,7 +30,7 @@ module QA
             mirror_settings.authentication_method = 'Password'
             mirror_settings.password = Runtime::User.password
             mirror_settings.mirror_repository
-            mirror_settings.update target_project_uri
+            mirror_settings.update target_project_uri # rubocop:disable Rails/SaveBang
           end
         end
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb
index ec63ed9cdf1..6d3d86d0663 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Create' do
     describe 'Push mirror a repository over HTTP' do
-      it 'configures and syncs a (push) mirrored repository', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1587' do
+      it 'configures and syncs a (push) mirrored repository', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347741' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)
 
@@ -29,7 +29,7 @@ module QA
             mirror_settings.authentication_method = 'Password'
             mirror_settings.password = Runtime::User.password
             mirror_settings.mirror_repository
-            mirror_settings.update target_project_uri
+            mirror_settings.update target_project_uri # rubocop:disable Rails/SaveBang
           end
         end
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb
index 727a9e27c63..812a7bae6c3 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb
@@ -26,7 +26,7 @@ module QA
         set_file_size_limit(nil)
       end
 
-      it 'push successful when the file size is under the limit', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1556' do
+      it 'push successful when the file size is under the limit', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347758' do
         set_file_size_limit(5)
 
         retry_on_fail do
@@ -36,7 +36,7 @@ module QA
         end
       end
 
-      it 'push fails when the file size is above the limit', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1554' do
+      it 'push fails when the file size is above the limit', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347759' do
         set_file_size_limit(2)
 
         retry_on_fail do
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
index 4c294f21859..a782a50b55d 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Create' do
     describe 'Git push over HTTP' do
-      it 'user pushes code to the repository', :smoke, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1576' do
+      it 'user pushes code to the repository', :smoke, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347747' do
         Flow::Login.sign_in
 
         Resource::Repository::ProjectPush.fabricate! do |push|
@@ -18,7 +18,7 @@ module QA
         end
       end
 
-      it 'pushes to a project using a specific Praefect repository storage', :smoke, :requires_admin, :requires_praefect, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1389' do
+      it 'pushes to a project using a specific Praefect repository storage', :smoke, :requires_admin, :requires_praefect, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347789' do
         Flow::Login.sign_in_as_admin
 
         project = Resource::Project.fabricate_via_api! do |storage_project|
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb
index be0d48e5ab9..0323448878b 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_ssh_spec.rb
@@ -26,7 +26,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'pushes code to the repository via SSH', :smoke, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1283' do
+      it 'pushes code to the repository via SSH', :smoke, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347825' do
         Resource::Repository::ProjectPush.fabricate! do |push|
           push.project = project
           push.ssh_key = @key
@@ -41,7 +41,7 @@ module QA
         end
       end
 
-      it 'pushes multiple branches and tags together', :smoke, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1282' do
+      it 'pushes multiple branches and tags together', :smoke, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347826' do
         branches = []
         tags = []
         Git::Repository.perform do |repository|
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
index 318d905c149..f8129c9ccba 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
@@ -18,7 +18,7 @@ module QA
       end
 
       context 'when developers and maintainers are allowed to push to a protected branch' do
-        it 'user with push rights successfully pushes to the protected branch', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1563' do
+        it 'user with push rights successfully pushes to the protected branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347756' do
           create_protected_branch(allowed_to_push: {
             roles: Resource::ProtectedBranch::Roles::DEVS_AND_MAINTAINERS
           })
@@ -30,7 +30,7 @@ module QA
       end
 
       context 'when developers and maintainers are not allowed to push to a protected branch' do
-        it 'user without push rights fails to push to the protected branch', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1562' do
+        it 'user without push rights fails to push to the protected branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347757' do
           create_protected_branch(allowed_to_push: {
             roles: Resource::ProtectedBranch::Roles::NO_ONE
           })
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
index 3f488a1610d..2e8c43d6981 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
@@ -9,7 +9,7 @@ module QA
       Flow::Login.sign_in
     end
 
-    it 'user can add an SSH key', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1304' do
+    it 'user can add an SSH key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347819' do
       key = Resource::SSHKey.fabricate_via_browser_ui! do |resource|
         resource.title = key_title
       end
@@ -20,7 +20,7 @@ module QA
 
     # Note this context ensures that the example it contains is executed after the example above. Be aware of the order of execution if you add new examples in either context.
     context 'after adding an ssh key' do
-      it 'can delete an ssh key', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1303' do
+      it 'can delete an ssh key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347820' do
         Page::Main::Menu.perform(&:click_edit_profile_link)
         Page::Profile::Menu.perform(&:click_ssh_keys)
         Page::Profile::SSHKeys.perform do |ssh_keys|
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
index d445f4d091b..bbf6c3ca37a 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb
@@ -43,7 +43,7 @@ module QA
         find('pre').text
       end
 
-      it 'user views raw email patch', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1566' do
+      it 'user views raw email patch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347755' do
         view_commit
 
         Page::Project::Commit::Show.perform(&:select_email_patches)
@@ -53,7 +53,7 @@ module QA
         expect(page).to have_content('diff --git a/second b/second')
       end
 
-      it 'user views raw commit diff', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1568' do
+      it 'user views raw commit diff', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347754' do
         view_commit
 
         Page::Project::Commit::Show.perform(&:select_plain_diff)
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_personal_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_personal_snippet_spec.rb
index b41e90fa834..8f22a28628f 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_personal_snippet_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_personal_snippet_spec.rb
@@ -39,7 +39,7 @@ module QA
         ssh_key.remove_via_api!
       end
 
-      it 'clones, pushes, and pulls a snippet over HTTP, edits via UI', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1363' do
+      it 'clones, pushes, and pulls a snippet over HTTP, edits via UI', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347793' do
         push = Resource::Repository::Push.fabricate! do |push|
           push.repository_http_uri = repository_uri_http
           push.file_name = new_file
@@ -70,7 +70,7 @@ module QA
         snippet.remove_via_api!
       end
 
-      it 'clones, pushes, and pulls a snippet over SSH, deletes via UI', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1364' do
+      it 'clones, pushes, and pulls a snippet over SSH, deletes via UI', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347792' do
         push = Resource::Repository::Push.fabricate! do |push|
           push.repository_ssh_uri = repository_uri_ssh
           push.ssh_key = ssh_key
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_project_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_project_snippet_spec.rb
index e8b2ffe1f14..9a5fe44c927 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_project_snippet_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/clone_push_pull_project_snippet_spec.rb
@@ -40,7 +40,7 @@ module QA
         ssh_key.remove_via_api!
       end
 
-      it 'clones, pushes, and pulls a project snippet over HTTP, edits via UI', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1359' do
+      it 'clones, pushes, and pulls a project snippet over HTTP, edits via UI', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347797' do
         Resource::Repository::Push.fabricate! do |push|
           push.repository_http_uri = repository_uri_http
           push.file_name = new_file
@@ -71,7 +71,7 @@ module QA
         snippet.remove_via_api!
       end
 
-      it 'clones, pushes, and pulls a project snippet over SSH, deletes via UI', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1360' do
+      it 'clones, pushes, and pulls a project snippet over SSH, deletes via UI', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347796' do
         Resource::Repository::Push.fabricate! do |push|
           push.repository_ssh_uri = repository_uri_ssh
           push.ssh_key = ssh_key
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb
index 300fd6a1be2..dc66e0c5a9f 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb
@@ -21,7 +21,7 @@ module QA
         snippet.remove_via_api!
       end
 
-      it 'user creates a personal snippet', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1357' do
+      it 'user creates a personal snippet', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347799' do
         snippet.visit!
 
         Page::Dashboard::Snippet::Show.perform do |snippet|
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_with_multiple_files_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_with_multiple_files_spec.rb
index a32ee472150..28bea89e3bd 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_with_multiple_files_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_with_multiple_files_spec.rb
@@ -26,7 +26,7 @@ module QA
         snippet.remove_via_api!
       end
 
-      it 'creates a personal snippet with multiple files', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1654' do
+      it 'creates a personal snippet with multiple files', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347723' do
         snippet.visit!
 
         Page::Dashboard::Snippet::Show.perform do |snippet|
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_spec.rb
index 1967273ca17..56cbe7d6bfa 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_spec.rb
@@ -21,7 +21,7 @@ module QA
         snippet.remove_via_api!
       end
 
-      it 'user creates a project snippet', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1358' do
+      it 'user creates a project snippet', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347798' do
         snippet.visit!
 
         Page::Dashboard::Snippet::Show.perform do |snippet|
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_with_multiple_files_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_with_multiple_files_spec.rb
index ae71be26a38..3d69ef5dde6 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_with_multiple_files_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/create_project_snippet_with_multiple_files_spec.rb
@@ -28,7 +28,7 @@ module QA
         snippet.remove_via_api!
       end
 
-      it 'creates a project snippet with multiple files', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1648' do
+      it 'creates a project snippet with multiple files', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347725' do
         snippet.visit!
 
         Page::Dashboard::Snippet::Show.perform do |snippet|
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/share_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/share_snippet_spec.rb
index 53e1e8e2e02..6777c113f36 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/share_snippet_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/share_snippet_spec.rb
@@ -21,7 +21,7 @@ module QA
       end
 
       context 'when the snippet is public' do
-        it 'can be shared with not signed-in users', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1248' do
+        it 'can be shared with not signed-in users', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347836' do
           snippet.visit!
 
           sharing_link = Page::Dashboard::Snippet::Show.perform do |snippet|
@@ -43,7 +43,7 @@ module QA
       end
 
       context 'when the snippet is changed to private' do
-        it 'does not display Embed/Share dropdown', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1249' do
+        it 'does not display Embed/Share dropdown', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347835' do
           snippet.visit!
 
           Page::Dashboard::Snippet::Show.perform do |snippet|
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb
index b92c8e881ab..9735aa7959a 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_new_directory_in_web_ide_spec.rb
@@ -35,7 +35,7 @@ module QA
           Page::Project::Show.perform(&:open_web_ide!)
         end
 
-        it 'throws an error', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1618' do
+        it 'throws an error', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347733' do
           Page::Project::WebIDE::Edit.perform do |ide|
             ide.add_directory(directory_name)
           end
@@ -51,7 +51,7 @@ module QA
           Page::Project::Show.perform(&:open_web_ide!)
         end
 
-        it 'shows in the tree view but cannot be committed', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1619' do
+        it 'shows in the tree view but cannot be committed', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347732' do
           Page::Project::WebIDE::Edit.perform do |ide|
             ide.add_directory(directory_name)
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/create_first_file_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/create_first_file_in_web_ide_spec.rb
index 2e37cc98555..948417458fc 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/create_first_file_in_web_ide_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/create_first_file_in_web_ide_spec.rb
@@ -16,7 +16,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it "creates the first file in an empty project via Web IDE", testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1353' do
+      it "creates the first file in an empty project via Web IDE", testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347803' do
         project.visit!
         Page::Project::Show.perform(&:create_first_new_file!)
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/link_to_line_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/link_to_line_in_web_ide_spec.rb
index 158e841514c..9c1d327f02c 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/link_to_line_in_web_ide_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/link_to_line_in_web_ide_spec.rb
@@ -18,7 +18,7 @@ module QA
         project.remove_via_api!
       end
 
-      it 'can link to a specific line of code in Web IDE', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1844' do
+      it 'can link to a specific line of code in Web IDE', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347676' do
         project.visit!
 
         # Open Web IDE by using a keyboard shortcut
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/open_fork_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/open_fork_in_web_ide_spec.rb
index 99a9bc5b2d0..758aae9f729 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/open_fork_in_web_ide_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/open_fork_in_web_ide_spec.rb
@@ -14,7 +14,7 @@ module QA
         let(:user) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
 
         context 'when no fork is present' do
-          it 'suggests to create a fork when a user clicks Web IDE in the main project', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1289' do
+          it 'suggests to create a fork when a user clicks Web IDE in the main project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347823' do
             Flow::Login.sign_in(as: user)
 
             parent_project.visit!
@@ -34,7 +34,7 @@ module QA
             end
           end
 
-          it 'opens the fork when a user clicks Web IDE in the main project', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1288' do
+          it 'opens the fork when a user clicks Web IDE in the main project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347824' do
             Flow::Login.sign_in(as: user)
             fork_project.upstream.visit!
             Page::Project::Show.perform do |project_page|
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/open_web_ide_from_diff_tab_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/open_web_ide_from_diff_tab_spec.rb
index 061ab66b271..fc5754e2c7a 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/open_web_ide_from_diff_tab_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/open_web_ide_from_diff_tab_spec.rb
@@ -49,7 +49,7 @@ module QA
         merge_request.visit!
       end
 
-      it 'opens and edits a multi-file merge request in Web IDE from Diff Tab', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1649' do
+      it 'opens and edits a multi-file merge request in Web IDE from Diff Tab', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347724' do
         Page::MergeRequest::Show.perform do |show|
           show.click_diffs_tab
           show.edit_file_in_web_ide('file1')
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb
index 7135e04e457..bd19d70ae5c 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb
@@ -20,7 +20,7 @@ module QA
         merge_request.visit!
       end
 
-      it 'opens and edits a merge request in Web IDE', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1420' do
+      it 'opens and edits a merge request in Web IDE', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347786' do
         Page::MergeRequest::Show.perform do |show|
           show.click_open_in_web_ide
         end
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb
index 705ee954bcb..3d9d5695d06 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/upload_new_file_in_web_ide_spec.rb
@@ -22,7 +22,7 @@ module QA
       context 'when a file with the same name already exists' do
         let(:file_name) { 'README.md' }
 
-        it 'throws an error', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1214' do
+        it 'throws an error', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347850' do
           Page::Project::WebIDE::Edit.perform do |ide|
             ide.upload_file(file_path)
           end
@@ -34,7 +34,7 @@ module QA
       context 'when the file is a text file' do
         let(:file_name) { 'text_file.txt' }
 
-        it 'shows the Edit tab with the text', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1212' do
+        it 'shows the Edit tab with the text', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347852' do
           Page::Project::WebIDE::Edit.perform do |ide|
             ide.upload_file(file_path)
 
@@ -52,7 +52,7 @@ module QA
       context 'when the file is binary' do
         let(:file_name) { 'logo_sample.svg' }
 
-        it 'shows a Download button', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1213' do
+        it 'shows a Download button', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347851' do
           Page::Project::WebIDE::Edit.perform do |ide|
             ide.upload_file(file_path)
 
@@ -70,7 +70,7 @@ module QA
       context 'when the file is an image' do
         let(:file_name) { 'dk.png' }
 
-        it 'shows an image viewer', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1211' do
+        it 'shows an image viewer', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347853' do
           Page::Project::WebIDE::Edit.perform do |ide|
             ide.upload_file(file_path)
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/web_terminal_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/web_terminal_spec.rb
index 51791c01048..022731faade 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/web_terminal_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/web_terminal_spec.rb
@@ -56,7 +56,7 @@ module QA
         @runner.remove_via_api! if @runner
       end
 
-      it 'user starts the web terminal', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1593' do
+      it 'user starts the web terminal', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347737' do
         Page::Project::Show.perform(&:open_web_ide!)
 
         # Start the web terminal and check that there were no errors
@@ -65,6 +65,7 @@ module QA
         #  a) The terminal JS package has loaded, and
         #  b) It's not stuck in a "Loading/Starting" state, and
         #  c) There's no alert stating there was a problem
+        #  d) There are no JS console errors
         #
         # The terminal itself is a third-party package so we assume it is
         # adequately tested elsewhere.
@@ -78,6 +79,17 @@ module QA
           expect(edit).to have_finished_loading
           expect(edit).to have_terminal_screen
         end
+
+        # It takes a few seconds for console errors to appear
+        sleep 3
+
+        errors = page.driver.browser.logs.get(:browser)
+                     .select { |e| e.level == "SEVERE" }
+                     .to_a
+
+        if errors.present?
+          raise("Console error(s):\n#{errors.join("\n\n")}")
+        end
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/content_editor_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/content_editor_spec.rb
index bd4b82d8ea0..a063acbe146 100644
--- a/qa/qa/specs/features/browser_ui/3_create/wiki/content_editor_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/wiki/content_editor_spec.rb
@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Create' do
+  RSpec.describe 'Create', :requires_admin do # remove :requires_admin once the ff is enabled by default in https://gitlab.com/gitlab-org/gitlab/-/issues/345398
     context 'Content Editor' do
       let(:initial_wiki) { Resource::Wiki::ProjectPage.fabricate_via_api! }
       let(:page_title) { 'Content Editor Page' }
       let(:heading_text) { 'My New Heading' }
       let(:image_file_name) { 'testfile.png' }
+      let!(:toggle) { Runtime::Feature.enabled?(:wiki_switch_between_content_editor_raw_markdown) }
 
       before do
         Flow::Login.sign_in
@@ -16,14 +17,14 @@ module QA
         initial_wiki.project.remove_via_api!
       end
 
-      it 'creates a formatted Wiki page with an image uploaded', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1919' do
+      it 'creates a formatted Wiki page with an image uploaded', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347640' do
         initial_wiki.visit!
 
         Page::Project::Wiki::Show.perform(&:click_new_page)
 
         Page::Project::Wiki::Edit.perform do |edit|
           edit.set_title(page_title)
-          edit.use_new_editor
+          edit.use_new_editor(toggle)
           edit.add_heading('Heading 1', heading_text)
           edit.upload_image(File.absolute_path(File.join('qa', 'fixtures', 'designs', image_file_name)))
         end
diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_content_creation_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_content_creation_spec.rb
index 40188fae06c..648ef513e12 100644
--- a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_content_creation_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_content_creation_spec.rb
@@ -15,7 +15,7 @@ module QA
           Flow::Login.sign_in
         end
 
-        it 'by adding a home page to the wiki', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1347' do
+        it 'by adding a home page to the wiki', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347809' do
           project.visit!
 
           Page::Project::Menu.perform(&:click_wiki)
@@ -35,7 +35,7 @@ module QA
           end
         end
 
-        it 'by adding a second page to the wiki', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1348' do
+        it 'by adding a second page to the wiki', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347808' do
           wiki.visit!
 
           Page::Project::Wiki::Show.perform(&:click_new_page)
@@ -54,7 +54,7 @@ module QA
           end
         end
 
-        it 'by adding a home page to the wiki using git push', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1350' do
+        it 'by adding a home page to the wiki using git push', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347806' do
           empty_wiki = Resource::Wiki::ProjectPage.new do |empty_wiki|
             empty_wiki.project = project
           end
@@ -73,7 +73,7 @@ module QA
           end
         end
 
-        it 'by adding a second page to the wiki using git push', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1349' do
+        it 'by adding a second page to the wiki using git push', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347807' do
           Resource::Repository::WikiPush.fabricate! do |push|
             push.file_name = "#{new_wiki_title}.md"
             push.file_content = new_wiki_content
diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_content_manipulation_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_content_manipulation_spec.rb
index 5b277d07fea..251728c149f 100644
--- a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_content_manipulation_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_content_manipulation_spec.rb
@@ -14,7 +14,7 @@ module QA
           Flow::Login.sign_in
         end
 
-        it 'by manipulating content on the page', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1346' do
+        it 'by manipulating content on the page', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347810' do
           wiki.visit!
 
           Page::Project::Wiki::Show.perform(&:click_edit)
@@ -33,7 +33,7 @@ module QA
           end
         end
 
-        it 'by manipulating content on the page using git push', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1345' do
+        it 'by manipulating content on the page using git push', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347811' do
           Resource::Repository::WikiPush.fabricate! do |push|
             push.file_content = new_wiki_content
             push.commit_message = commit_message
diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_directory_management_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_directory_management_spec.rb
index 9784ad2e9c1..2d24f69c883 100644
--- a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_directory_management_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_directory_management_spec.rb
@@ -10,7 +10,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'has changed the directory', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1293' do
+      it 'has changed the directory', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347821' do
         initial_wiki.visit!
 
         Page::Project::Wiki::Show.perform(&:click_edit)
diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_list_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_list_spec.rb
index c91fc8e10f7..703d425079d 100644
--- a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_list_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_list_spec.rb
@@ -15,7 +15,7 @@ module QA
       end
 
       context 'Sidebar' do
-        it 'has all expected links that work', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1317' do
+        it 'has all expected links that work', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347814' do
           small_wiki.visit!
 
           small_number_of_pages.times do |index|
@@ -35,7 +35,7 @@ module QA
       end
 
       context 'Page List' do
-        it 'has all expected links that work', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1318' do
+        it 'has all expected links that work', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347813' do
           large_wiki.visit!
 
           Page::Project::Wiki::Show.perform(&:click_view_all_pages)
diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_page_deletion_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_page_deletion_spec.rb
index 71ce042f0a3..78d6d51f260 100644
--- a/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_page_deletion_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/wiki/project_based_page_deletion_spec.rb
@@ -10,7 +10,7 @@ module QA
       end
 
       context 'Page deletion' do
-        it 'has removed the deleted page correctly', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1310' do
+        it 'has removed the deleted page correctly', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347815' do
           initial_wiki.visit!
 
           Page::Project::Wiki::Show.perform(&:click_edit)
diff --git a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb
index c8b308d53ef..fa8d0d1501c 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/add_remove_ci_variable_spec.rb
@@ -16,7 +16,7 @@ module QA
         add_ci_variable
       end
 
-      it 'user adds a CI variable', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1597' do
+      it 'user adds a CI variable', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348027' do
         Page::Project::Settings::CiVariables.perform do |ci_variable|
           expect(ci_variable).to have_text('VARIABLE_KEY')
           expect(ci_variable).not_to have_text('some_CI_variable')
@@ -27,7 +27,7 @@ module QA
         end
       end
 
-      it 'user removes a CI variable', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1598' do
+      it 'user removes a CI variable', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348026' do
         Page::Project::Settings::CiVariables.perform do |ci_variable|
           ci_variable.click_edit_ci_variable
           ci_variable.click_ci_variable_delete_button
diff --git a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb
index 4d21a98e072..7704111ea21 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/ci_variable/pipeline_with_protected_variable_spec.rb
@@ -61,7 +61,7 @@ module QA
         runner.remove_via_api!
       end
 
-      it 'exposes variable on protected branch', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1714' do
+      it 'exposes variable on protected branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348005' do
         create_protected_branch
 
         [developer, maintainer].each do |user|
@@ -74,7 +74,7 @@ module QA
         end
       end
 
-      it 'does not expose variable on unprotected branch', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1885' do
+      it 'does not expose variable on unprotected branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347664' do
         [developer, maintainer].each do |user|
           create_merge_request(Runtime::API::Client.new(:gitlab, user: user))
           go_to_pipeline_job(user)
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
index e6910ad8592..bd3135bafdc 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb
@@ -23,7 +23,7 @@ module QA
         [runner, project].each(&:remove_via_api!)
       end
 
-      it 'users creates a pipeline which gets processed', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1601' do
+      it 'users creates a pipeline which gets processed', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348024' do
         Flow::Login.sign_in
 
         Resource::Repository::Commit.fabricate_via_api! do |commit|
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_local_config_file_paths_with_wildcard_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_local_config_file_paths_with_wildcard_spec.rb
index 27b45d1a2a0..f2ebc191a8a 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_local_config_file_paths_with_wildcard_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/include_local_config_file_paths_with_wildcard_spec.rb
@@ -20,7 +20,7 @@ module QA
         project.remove_via_api!
       end
 
-      it 'runs the pipeline with composed config', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1814' do
+      it 'runs the pipeline with composed config', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348002' do
         Page::Project::Pipeline::Show.perform do |pipeline|
           aggregate_failures 'pipeline has all expected jobs' do
             expect(pipeline).to have_job('build')
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 9d145a3becf..9521cd20fc5 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
@@ -39,7 +39,7 @@ module QA
         runner.remove_via_api!
       end
 
-      it 'runs the pipeline with composed config', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1223' do
+      it 'runs the pipeline with composed config', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348087' do
         Page::Project::Pipeline::Show.perform do |pipeline|
           aggregate_failures 'pipeline has all expected jobs' do
             expect(pipeline).to have_job('build')
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/locked_artifacts_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/locked_artifacts_spec.rb
index 7faf4114d02..9abb25c8dc1 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/locked_artifacts_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/locked_artifacts_spec.rb
@@ -30,7 +30,7 @@ module QA
           runner.remove_via_api!
         end
 
-        it 'can be browsed', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1808' do
+        it 'can be browsed', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348003' do
           Resource::Repository::Commit.fabricate_via_api! do |commit|
             commit.project = project
             commit.commit_message = 'Add .gitlab-ci.yml'
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
index 8dfd485bbf1..d201627218e 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
@@ -68,7 +68,7 @@ module QA
         runner.remove_via_api!
       end
 
-      it 'can still merge MR successfully', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1281' do
+      it 'can still merge MR successfully', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348080' do
         Page::MergeRequest::Show.perform do |show|
           # waiting for manual action status shows status badge 'blocked' on pipelines page
           show.has_pipeline_status?('waiting for manual action')
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/mr_event_rule_pipeline_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/mr_event_rule_pipeline_spec.rb
index 0ddfcf8cafb..65561bbba29 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/mr_event_rule_pipeline_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/mr_event_rule_pipeline_spec.rb
@@ -66,7 +66,7 @@ module QA
         project.remove_via_api!
       end
 
-      it 'only runs the job configured to run on merge requests', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1890' do
+      it 'only runs the job configured to run on merge requests', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347662' do
         Page::Project::Pipeline::Show.perform do |pipeline|
           aggregate_failures do
             expect(pipeline).to have_job(mr_only_job_name)
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 9fd54251411..22bb5fed84c 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
@@ -42,7 +42,7 @@ module QA
         [upstream_project, downstream_project].each(&:remove_via_api!)
       end
 
-      it 'runs the pipeline with composed config', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1221' do
+      it 'runs the pipeline with composed config', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348088' do
         Page::Project::Pipeline::Show.perform do |parent_pipeline|
           Support::Waiter.wait_until { parent_pipeline.has_child_pipeline? }
           parent_pipeline.expand_child_pipeline
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_branch_switcher_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_branch_switcher_spec.rb
index 1a2d450f7eb..8d2af3ea0df 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_branch_switcher_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_branch_switcher_spec.rb
@@ -2,7 +2,9 @@
 
 module QA
   RSpec.describe 'Verify' do
-    describe 'Pipeline editor', :requires_admin do
+    describe 'Pipeline editor' do
+      let(:random_test_string) { SecureRandom.hex(10) }
+
       let(:project) do
         Resource::Project.fabricate_via_api! do |project|
           project.name = 'pipeline-editor-project'
@@ -17,70 +19,71 @@ module QA
             [
               {
                 file_path: '.gitlab-ci.yml',
-                content: default_file_content
+                content: <<~YAML
+                  stages:
+                    - test
+
+                  initialize:
+                    stage: test
+                    script:
+                      - echo "I am now on branch #{project.default_branch}"
+                YAML
               }
             ]
           )
         end
       end
 
-      let!(:production_push) do
-        Resource::Repository::Push.fabricate! do |push|
-          push.repository_http_uri = project.repository_http_location.uri
-          push.branch_name = 'production'
-          push.file_name = '.gitlab-ci.yml'
-          push.file_content = production_file_content
-        end
-      end
-
-      let(:default_file_content) do
-        <<~YAML
-          stages:
-            - test
-          
-          initialize:
-            stage: test
-            script:
-              - echo "initialized in #{project.default_branch}"
-        YAML
-      end
+      let!(:test_branch) do
+        Resource::Repository::ProjectPush.fabricate! do |resource|
+          resource.project = project
+          resource.branch_name = random_test_string
+          resource.file_name = '.gitlab-ci.yml'
+          resource.file_content = <<~YAML
+            stages:
+              - test
 
-      let(:production_file_content) do
-        <<~YAML
-          stages:
-            - test
-          
-          initialize:
-            stage: test
-            script:
-              - echo "initialized in production"
-        YAML
+            initialize:
+              stage: test
+              script:
+                - echo "I am now on branch #{random_test_string}"
+          YAML
+        end
       end
 
       before do
         Flow::Login.sign_in
         project.visit!
-        Page::Project::Menu.perform(&:go_to_pipeline_editor)
+
+        # Project push sometimes takes a while to complete
+        # Making sure new branch is pushed successfully prior to interacting
+        Support::Retrier.retry_until(max_duration: 15, sleep_interval: 3, reload_page: false, message: 'Ensuring project has branch') do
+          project.has_branch?(random_test_string)
+        end
       end
 
       after do
         project.remove_via_api!
-        Page::Main::Menu.perform(&:sign_out)
       end
 
-      it 'can switch branches and target branch field updates accordingly', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1891' do
+      it 'can switch branches and target branch field updates accordingly', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347661' do
+        Page::Project::Menu.perform(&:go_to_pipeline_editor)
         Page::Project::PipelineEditor::Show.perform do |show|
-          expect(show).to have_branch_selector_button
-
-          show.click_branch_selector_button
-          show.select_branch_from_dropdown(production_push.branch_name)
+          show.open_branch_selector_dropdown
+          show.select_branch_from_dropdown(random_test_string)
 
-          expect(show.target_branch_name).to eq(production_push.branch_name)
+          aggregate_failures do
+            expect(show.target_branch_name).to eq(random_test_string), 'Target branch field is not showing expected branch name.'
+            expect(show.editing_content).to have_content(random_test_string), 'Editor content does not include expected test string.'
+          end
 
-          show.click_branch_selector_button
+          show.open_branch_selector_dropdown
           show.select_branch_from_dropdown(project.default_branch)
 
-          expect(show.target_branch_name).to eq(project.default_branch)
+          aggregate_failures do
+            expect(show.target_branch_name).to eq(project.default_branch), 'Target branch field is not showing expected branch name.'
+            expect(show.editing_content).to have_content(project.default_branch), 'Editor content does not include expected test string.'
+          end
         end
       end
     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 f599d6b6251..7656aea885e 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
@@ -40,7 +40,7 @@ module QA
           Page::Project::Menu.perform(&:click_ci_cd_pipelines)
         end
 
-        it 'can trigger pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1650' do
+        it 'can trigger pipeline', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348011' do
           Page::Project::Pipeline::Index.perform do |index|
             expect(index).not_to have_pipeline # should not auto trigger pipeline
             index.click_run_pipeline_button
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 f803cfdb714..ed46481d3be 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
@@ -30,7 +30,7 @@ module QA
         runner.remove_via_api!
       end
 
-      it 'can trigger bridge job', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1237' do
+      it 'can trigger bridge job', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348086' do
         Page::Project::Pipeline::Show.perform do |parent_pipeline|
           expect(parent_pipeline).not_to have_child_pipeline
 
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_matrix_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_matrix_spec.rb
index 0bfbd164331..94ac857f0fe 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_matrix_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_matrix_spec.rb
@@ -31,7 +31,7 @@ module QA
         project.remove_via_api!
       end
 
-      it 'creates 2 trigger jobs and passes corresponding matrix variables', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1824' do
+      it 'creates 2 trigger jobs and passes corresponding matrix variables', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348000' do
         Page::Project::Pipeline::Show.perform do |parent_pipeline|
           trigger_title1 = 'deploy: [ovh, monitoring]'
           trigger_title2 = 'deploy: [ovh, app]'
diff --git a/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb
index 42aec99d6cf..8aa01888ae3 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb
@@ -15,7 +15,7 @@ module QA
         runner.remove_via_api!
       end
 
-      it 'user registers a new specific runner', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1600' do
+      it 'user registers a new specific runner', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348025' do
         Flow::Login.sign_in
 
         runner.project.visit!
diff --git a/qa/qa/specs/features/browser_ui/4_verify/testing/view_code_coverage_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/testing/view_code_coverage_spec.rb
index c85920d98ec..f44c56ca0f9 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/testing/view_code_coverage_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/testing/view_code_coverage_spec.rb
@@ -33,7 +33,7 @@ module QA
         runner.remove_via_api!
       end
 
-      it 'creates an MR with code coverage statistics', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1373' do
+      it 'creates an MR with code coverage statistics', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348068' do
         runner.project.visit!
         configure_code_coverage(simplecov)
         merge_request.visit!
diff --git a/qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_omnibus_spec.rb b/qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_omnibus_spec.rb
index 51735d79fbd..e3c06242a9b 100644
--- a/qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_omnibus_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_omnibus_spec.rb
@@ -14,15 +14,15 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::DeployToken.fabricate_via_browser_ui! do |deploy_token|
+        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
           deploy_token.name = 'registry-deploy-token'
           deploy_token.project = project
-          deploy_token.scopes = [
-            :read_repository,
-            :read_package_registry,
-            :write_package_registry,
-            :read_registry,
-            :write_registry
+          deploy_token.scopes = %w[
+            read_repository
+            read_package_registry
+            write_package_registry
+            read_registry
+            write_registry
           ]
         end
       end
@@ -48,37 +48,95 @@ module QA
         project.remove_via_api!
       end
 
-      where(:authentication_token_type, :token_name) do
-        :personal_access_token | 'Personal Access Token'
-        :project_deploy_token  | 'Deploy Token'
-        :ci_job_token          | 'Job Token'
-      end
+      context "when tls is disabled" do
+        where(:authentication_token_type, :token_name) do
+          :personal_access_token | 'Personal Access Token'
+          :project_deploy_token  | 'Deploy Token'
+          :ci_job_token          | 'Job Token'
+        end
 
-      with_them do
-        let(:auth_token) do
-          case authentication_token_type
-          when :personal_access_token
-            "\"#{personal_access_token}\""
-          when :project_deploy_token
-            "\"#{project_deploy_token.password}\""
-          when :ci_job_token
-            '$CI_JOB_TOKEN'
+        with_them do
+          let(:auth_token) do
+            case authentication_token_type
+            when :personal_access_token
+              "\"#{personal_access_token}\""
+            when :project_deploy_token
+              "\"#{project_deploy_token.token}\""
+            when :ci_job_token
+              '$CI_JOB_TOKEN'
+            end
+          end
+
+          let(:auth_user) do
+            case authentication_token_type
+            when :personal_access_token
+              "$CI_REGISTRY_USER"
+            when :project_deploy_token
+              "\"#{project_deploy_token.username}\""
+            when :ci_job_token
+              'gitlab-ci-token'
+            end
           end
-        end
 
-        let(:auth_user) do
-          case authentication_token_type
-          when :personal_access_token
-            "$CI_REGISTRY_USER"
-          when :project_deploy_token
-            "\"#{project_deploy_token.username}\""
-          when :ci_job_token
-            'gitlab-ci-token'
+          where(:docker_client_version) do
+            %w[docker:18.09.9 docker:19.03.12 docker:20.10]
+          end
+
+          with_them do
+            it "pushes image and deletes tag", :registry do
+              Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+                Resource::Repository::Commit.fabricate_via_api! do |commit|
+                  commit.project = project
+                  commit.commit_message = 'Add .gitlab-ci.yml'
+                  commit.add_files([{
+                                      file_path: '.gitlab-ci.yml',
+                                      content:
+                                          <<~YAML
+                                            build:
+                                              image: "#{docker_client_version}"
+                                              stage: build
+                                              services:
+                                              - name: "#{docker_client_version}-dind"
+                                                command: ["--insecure-registry=gitlab.test:5050"]                                
+                                              variables:
+                                                IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+                                              script:
+                                                - docker login -u #{auth_user} -p #{auth_token} gitlab.test:5050
+                                                - docker build -t $IMAGE_TAG .
+                                                - docker push $IMAGE_TAG
+                                              tags:
+                                                - "runner-for-#{project.name}"
+                                          YAML
+                                  }])
+                end
+              end
+
+              Flow::Pipeline.visit_latest_pipeline
+
+              Page::Project::Pipeline::Show.perform do |pipeline|
+                pipeline.click_job('build')
+              end
+
+              Page::Project::Job::Show.perform do |job|
+                expect(job).to be_successful(timeout: 800)
+              end
+
+              Page::Project::Menu.perform(&:go_to_container_registry)
+
+              Page::Project::Registry::Show.perform do |registry|
+                expect(registry).to have_registry_repository(project.path_with_namespace)
+
+                registry.click_on_image(project.path_with_namespace)
+                expect(registry).to have_tag('master')
+              end
+            end
           end
         end
+      end
 
-        context "when tls is disabled" do
-          it "using a #{params[:token_name]}, pushes image and deletes tag", :registry do
+      context "when tls is enabled" do
+        it "pushes image and deletes tag", :registry_tls, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347591' do
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
             Resource::Repository::Commit.fabricate_via_api! do |commit|
               commit.project = project
               commit.commit_message = 'Add .gitlab-ci.yml'
@@ -91,11 +149,18 @@ module QA
                                           stage: build
                                           services:
                                           - name: docker:19.03.12-dind
-                                            command: ["--insecure-registry=gitlab.test:5050"]                                
+                                            command:
+                                            - /bin/sh
+                                            - -c
+                                            - |
+                                              apk add --no-cache openssl
+                                              true | openssl s_client -showcerts -connect gitlab.test:5050 > /usr/local/share/ca-certificates/gitlab.test.crt
+                                              update-ca-certificates
+                                              dockerd-entrypoint.sh || exit                                
                                           variables:
                                             IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
                                           script:
-                                            - docker login -u #{auth_user} -p #{auth_token} gitlab.test:5050
+                                            - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD gitlab.test:5050
                                             - docker build -t $IMAGE_TAG .
                                             - docker push $IMAGE_TAG
                                           tags:
@@ -103,64 +168,6 @@ module QA
                                       YAML
                               }])
             end
-
-            Flow::Pipeline.visit_latest_pipeline
-
-            Page::Project::Pipeline::Show.perform do |pipeline|
-              pipeline.click_job('build')
-            end
-
-            Page::Project::Job::Show.perform do |job|
-              expect(job).to be_successful(timeout: 800)
-            end
-
-            Page::Project::Menu.perform(&:go_to_container_registry)
-
-            Page::Project::Registry::Show.perform do |registry|
-              expect(registry).to have_registry_repository(project.path_with_namespace)
-
-              registry.click_on_image(project.path_with_namespace)
-              expect(registry).to have_tag('master')
-
-              registry.click_delete
-              expect(registry).not_to have_tag('master')
-            end
-          end
-        end
-      end
-
-      context "when tls is enabled" do
-        it "pushes image and deletes tag", :registry_tls, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2378' do
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([{
-                                file_path: '.gitlab-ci.yml',
-                                content:
-                                    <<~YAML
-                                      build:
-                                        image: docker:19.03.12
-                                        stage: build
-                                        services:
-                                        - name: docker:19.03.12-dind
-                                          command:
-                                          - /bin/sh
-                                          - -c
-                                          - |
-                                            apk add --no-cache openssl
-                                            true | openssl s_client -showcerts -connect gitlab.test:5050 > /usr/local/share/ca-certificates/gitlab.test.crt
-                                            update-ca-certificates
-                                            dockerd-entrypoint.sh || exit                                
-                                        variables:
-                                          IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-                                        script:
-                                          - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD gitlab.test:5050
-                                          - docker build -t $IMAGE_TAG .
-                                          - docker push $IMAGE_TAG
-                                        tags:
-                                          - "runner-for-#{project.name}"
-                                    YAML
-                            }])
           end
 
           Flow::Pipeline.visit_latest_pipeline
diff --git a/qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_spec.rb
index 65519cdebec..1df68cc729d 100644
--- a/qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_spec.rb
@@ -49,17 +49,19 @@ module QA
         registry_repository&.remove_via_api!
       end
 
-      it 'pushes project image to the container registry and deletes tag', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1833' do
+      it 'pushes project image to the container registry and deletes tag', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347687' do
         Flow::Login.sign_in
         project.visit!
 
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = project
-          commit.commit_message = 'Add .gitlab-ci.yml'
-          commit.add_files([{
-                              file_path: '.gitlab-ci.yml',
-                              content: gitlab_ci_yaml
-                            }])
+        Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.project = project
+            commit.commit_message = 'Add .gitlab-ci.yml'
+            commit.add_files([{
+                                file_path: '.gitlab-ci.yml',
+                                content: gitlab_ci_yaml
+                              }])
+          end
         end
 
         Flow::Pipeline.visit_latest_pipeline
diff --git a/qa/qa/specs/features/browser_ui/5_package/container_registry/online_garbage_collection_spec.rb b/qa/qa/specs/features/browser_ui/5_package/container_registry/online_garbage_collection_spec.rb
index 82b7af8eba7..e8d936e67b1 100644
--- a/qa/qa/specs/features/browser_ui/5_package/container_registry/online_garbage_collection_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/container_registry/online_garbage_collection_spec.rb
@@ -82,18 +82,20 @@ module QA
           setting.click_save_changes_button
         end
 
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = imported_project
-          commit.branch = 'online-gc-test-builder-poc'
-          commit.commit_message = 'Update .gitlab-ci.yml'
-          commit.update_files([{
-                              file_path: '.gitlab-ci.yml',
-                              content: gitlab_ci_yaml
-                            }])
+        Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.project = imported_project
+            commit.branch = 'online-gc-test-builder-poc'
+            commit.commit_message = 'Update .gitlab-ci.yml'
+            commit.update_files([{
+                                file_path: '.gitlab-ci.yml',
+                                content: gitlab_ci_yaml
+                              }])
+          end
         end
       end
 
-      it 'runs the online garbage collector tool', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1889' do
+      it 'runs the online garbage collector tool', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347663' do
         imported_project.visit!
 
         Flow::Pipeline.visit_latest_pipeline
diff --git a/qa/qa/specs/features/browser_ui/5_package/dependency_proxy/dependency_proxy_spec.rb b/qa/qa/specs/features/browser_ui/5_package/dependency_proxy/dependency_proxy_spec.rb
index b941d5434df..5e0f1911811 100644
--- a/qa/qa/specs/features/browser_ui/5_package/dependency_proxy/dependency_proxy_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/dependency_proxy/dependency_proxy_spec.rb
@@ -46,32 +46,34 @@ module QA
 
       with_them do
         it "pulls an image using the dependency proxy" do
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([{
-                                file_path: '.gitlab-ci.yml',
-                                content:
-                                    <<~YAML
-                                      dependency-proxy-pull-test:
-                                        image: "#{docker_client_version}"
-                                        services:
-                                        - name: "#{docker_client_version}-dind"
-                                          command: ["--insecure-registry=gitlab.test:80"]     
-                                        before_script:
-                                          - apk add curl jq grep
-                                          - echo $CI_DEPENDENCY_PROXY_SERVER
-                                          - docker login -u "$CI_DEPENDENCY_PROXY_USER" -p "$CI_DEPENDENCY_PROXY_PASSWORD" gitlab.test:80
-                                        script:
-                                          - docker pull #{dependency_proxy_url}/#{image_sha}
-                                          - TOKEN=$(curl "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq --raw-output .token)
-                                          - 'curl --head --header "Authorization: Bearer $TOKEN" "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest" 2>&1'
-                                          - docker pull #{dependency_proxy_url}/#{image_sha}
-                                          - 'curl --head --header "Authorization: Bearer $TOKEN" "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest" 2>&1'
-                                        tags:
-                                        - "runner-for-#{project.name}"
-                                    YAML
-                            }])
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.add_files([{
+                                  file_path: '.gitlab-ci.yml',
+                                  content:
+                                      <<~YAML
+                                        dependency-proxy-pull-test:
+                                          image: "#{docker_client_version}"
+                                          services:
+                                          - name: "#{docker_client_version}-dind"
+                                            command: ["--insecure-registry=gitlab.test:80"]     
+                                          before_script:
+                                            - apk add curl jq grep
+                                            - echo $CI_DEPENDENCY_PROXY_SERVER
+                                            - docker login -u "$CI_DEPENDENCY_PROXY_USER" -p "$CI_DEPENDENCY_PROXY_PASSWORD" gitlab.test:80
+                                          script:
+                                            - docker pull #{dependency_proxy_url}/#{image_sha}
+                                            - TOKEN=$(curl "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq --raw-output .token)
+                                            - 'curl --head --header "Authorization: Bearer $TOKEN" "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest" 2>&1'
+                                            - docker pull #{dependency_proxy_url}/#{image_sha}
+                                            - 'curl --head --header "Authorization: Bearer $TOKEN" "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest" 2>&1'
+                                          tags:
+                                          - "runner-for-#{project.name}"
+                                      YAML
+                              }])
+            end
           end
 
           project.visit!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
index 9ddf485870d..92e4d64fee4 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/composer_registry_spec.rb
@@ -70,19 +70,20 @@ module QA
 
       before do
         Flow::Login.sign_in
-
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = project
-          commit.commit_message = 'Add .gitlab-ci.yml'
-          commit.add_files([{
-                              file_path: '.gitlab-ci.yml',
-                              content: gitlab_ci_yaml
-                            },
-                            {
-                              file_path: 'composer.json',
-                              content: composer_json_file
-                            }]
-                          )
+        Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.project = project
+            commit.commit_message = 'Add .gitlab-ci.yml'
+            commit.add_files([{
+                                file_path: '.gitlab-ci.yml',
+                                content: gitlab_ci_yaml
+                              },
+                              {
+                                file_path: 'composer.json',
+                                content: composer_json_file
+                              }]
+                            )
+          end
         end
 
         project.visit!
@@ -102,7 +103,7 @@ module QA
         package.remove_via_api!
       end
 
-      it 'publishes a composer package and deletes it', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1634' do
+      it 'publishes a composer package and deletes it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348016' do
         Page::Project::Menu.perform(&:click_packages_link)
 
         Page::Project::Packages::Index.perform do |index|
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
index 126be22d760..15578cd5e6b 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/conan_repository_spec.rb
@@ -41,30 +41,32 @@ module QA
         package.remove_via_api!
       end
 
-      it 'publishes, installs, and deletes a Conan package', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1638' do
+      it 'publishes, installs, and deletes a Conan package', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348014' do
         Flow::Login.sign_in
 
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = project
-          commit.commit_message = 'Add .gitlab-ci.yml'
-          commit.add_files([{
-                                file_path: '.gitlab-ci.yml',
-                                content:
-                                    <<~YAML
-                                      image: conanio/gcc7
-
-                                      test_package:
-                                        stage: deploy
-                                        script:
-                                          - "conan remote add gitlab #{gitlab_address_with_port}/api/v4/projects/#{project.id}/packages/conan"
-                                          - "conan new #{package.name}/0.1 -t"
-                                          - "conan create . mycompany/stable"
-                                          - "CONAN_LOGIN_USERNAME=ci_user CONAN_PASSWORD=${CI_JOB_TOKEN} conan upload #{package.name}/0.1@mycompany/stable --all --remote=gitlab"
-                                          - "conan install #{package.name}/0.1@mycompany/stable --remote=gitlab"
-                                        tags:
-                                           - "runner-for-#{project.name}"
-                                    YAML
-                            }])
+        Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.project = project
+            commit.commit_message = 'Add .gitlab-ci.yml'
+            commit.add_files([{
+                                  file_path: '.gitlab-ci.yml',
+                                  content:
+                                      <<~YAML
+                                        image: conanio/gcc7
+
+                                        test_package:
+                                          stage: deploy
+                                          script:
+                                            - "conan remote add gitlab #{gitlab_address_with_port}/api/v4/projects/#{project.id}/packages/conan"
+                                            - "conan new #{package.name}/0.1 -t"
+                                            - "conan create . mycompany/stable"
+                                            - "CONAN_LOGIN_USERNAME=ci_user CONAN_PASSWORD=${CI_JOB_TOKEN} conan upload #{package.name}/0.1@mycompany/stable --all --remote=gitlab"
+                                            - "conan install #{package.name}/0.1@mycompany/stable --remote=gitlab"
+                                          tags:
+                                            - "runner-for-#{project.name}"
+                                      YAML
+                              }])
+          end
         end
 
         project.visit!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
index 86aca120eed..ded90607d67 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/generic_repository_spec.rb
@@ -57,18 +57,20 @@ module QA
       before do
         Flow::Login.sign_in
 
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = project
-          commit.commit_message = 'Add .gitlab-ci.yml'
-          commit.add_files([{
-                                file_path: '.gitlab-ci.yml',
-                                content: gitlab_ci_yaml
-                            },
-                            {
-                                file_path: 'file.txt',
-                                content: file_txt
-                            }]
-                          )
+        Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.project = project
+            commit.commit_message = 'Add .gitlab-ci.yml'
+            commit.add_files([{
+                                  file_path: '.gitlab-ci.yml',
+                                  content: gitlab_ci_yaml
+                              },
+                              {
+                                  file_path: 'file.txt',
+                                  content: file_txt
+                              }]
+                            )
+          end
         end
 
         project.visit!
@@ -98,7 +100,7 @@ module QA
         package.remove_via_api!
       end
 
-      it 'uploads a generic package, downloads and deletes it', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1628' do
+      it 'uploads a generic package, downloads and deletes it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348017' do
         Page::Project::Menu.perform(&:click_packages_link)
 
         Page::Project::Packages::Index.perform do |index|
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb
index 3f5e8b1a630..92d0f547764 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb
@@ -88,16 +88,17 @@ module QA
             when :ci_job_token
               '${CI_JOB_TOKEN}'
             when :project_deploy_token
-              project_deploy_token.password
+              project_deploy_token.token
             end
           end
 
           it "pushes and pulls a helm chart" do
-            # pushing
-            Resource::Repository::Commit.fabricate_via_api! do |commit|
-              commit.project = package_project
-              commit.commit_message = 'Add .gitlab-ci.yml'
-              commit.add_files([package_gitlab_ci_file, package_chart_yaml_file])
+            Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+              Resource::Repository::Commit.fabricate_via_api! do |commit|
+                commit.project = package_project
+                commit.commit_message = 'Add .gitlab-ci.yml'
+                commit.add_files([package_gitlab_ci_file, package_chart_yaml_file])
+              end
             end
 
             package_project.visit!
@@ -124,11 +125,12 @@ module QA
               expect(show).to have_package_info(package_name, package_version)
             end
 
-            # pulling
-            Resource::Repository::Commit.fabricate_via_api! do |commit|
-              commit.project = client_project
-              commit.commit_message = 'Add .gitlab-ci.yml'
-              commit.add_files([client_gitlab_ci_file])
+            Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+              Resource::Repository::Commit.fabricate_via_api! do |commit|
+                commit.project = client_project
+                commit.commit_message = 'Add .gitlab-ci.yml'
+                commit.add_files([client_gitlab_ci_file])
+              end
             end
 
             client_project.visit!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb
index 2aa93de0b9e..57e1aa6a087 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb
@@ -97,7 +97,7 @@ module QA
           when :ci_job_token
             'System.getenv("CI_JOB_TOKEN")'
           when :project_deploy_token
-            "\"#{project_deploy_token.password}\""
+            "\"#{project_deploy_token.token}\""
           end
         end
 
@@ -139,11 +139,12 @@ module QA
         end
 
         it "pushes and pulls a maven package via gradle using #{params[:authentication_token_type]}" do
-          # pushing
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = package_project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([package_gitlab_ci_file, package_build_gradle_file])
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = package_project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.add_files([package_gitlab_ci_file, package_build_gradle_file])
+            end
           end
 
           package_project.visit!
@@ -170,11 +171,12 @@ module QA
             expect(show).to have_package_info(package_name, package_version)
           end
 
-          # pulling
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = client_project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([client_gitlab_ci_file, client_build_gradle_file])
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = client_project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.add_files([client_gitlab_ci_file, client_build_gradle_file])
+            end
           end
 
           client_project.visit!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_repository_spec.rb
index f42093bffcd..e6591b6adb9 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/maven_repository_spec.rb
@@ -142,7 +142,7 @@ module QA
           when :ci_job_token
             '${env.CI_JOB_TOKEN}'
           when :project_deploy_token
-            project_deploy_token.password
+            project_deploy_token.token
           end
         end
 
@@ -171,15 +171,16 @@ module QA
         end
 
         it "pushes and pulls a maven package via maven using #{params[:authentication_token_type]}" do
-          # pushing
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = package_project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([
-              package_gitlab_ci_file,
-              package_pom_file,
-              settings_xml
-            ])
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = package_project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.add_files([
+                package_gitlab_ci_file,
+                package_pom_file,
+                settings_xml
+              ])
+            end
           end
 
           package_project.visit!
@@ -206,15 +207,16 @@ module QA
             expect(show).to have_package_info(package_name, package_version)
           end
 
-          # pulling
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = client_project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([
-              client_gitlab_ci_file,
-              client_pom_file,
-              settings_xml
-            ])
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = client_project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.add_files([
+                client_gitlab_ci_file,
+                client_pom_file,
+                settings_xml
+              ])
+            end
           end
 
           client_project.visit!
@@ -290,14 +292,16 @@ module QA
           end
 
           def push_duplicated_package
-            Resource::Repository::Commit.fabricate_via_api! do |commit|
-              commit.project = client_project
-              commit.commit_message = 'Add .gitlab-ci.yml'
-              commit.add_files([
-                package_gitlab_ci_file,
-                package_pom_file,
-                settings_xml
-              ])
+            Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+              Resource::Repository::Commit.fabricate_via_api! do |commit|
+                commit.project = client_project
+                commit.commit_message = 'Add .gitlab-ci.yml'
+                commit.add_files([
+                  package_gitlab_ci_file,
+                  package_pom_file,
+                  settings_xml
+                ])
+              end
             end
           end
 
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
index f2b1c1b01a0..c58cdec622d 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb
@@ -16,13 +16,13 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::DeployToken.fabricate_via_browser_ui! do |deploy_token|
+        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
           deploy_token.name = 'npm-deploy-token'
           deploy_token.project = project
-          deploy_token.scopes = [
-            :read_repository,
-            :read_package_registry,
-            :write_package_registry
+          deploy_token.scopes = %w[
+            read_repository
+            read_package_registry
+            write_package_registry
           ]
         end
       end
@@ -151,18 +151,20 @@ module QA
           when :ci_job_token
             '${CI_JOB_TOKEN}'
           when :project_deploy_token
-            "\"#{project_deploy_token.password}\""
+            "\"#{project_deploy_token.token}\""
           end
         end
 
         it "push and pull a npm package via CI using a #{params[:token_name]}" do
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([
-                              gitlab_ci_deploy_yaml,
-                              package_json
-                            ])
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.add_files([
+                                gitlab_ci_deploy_yaml,
+                                package_json
+                              ])
+            end
           end
 
           project.visit!
@@ -176,12 +178,14 @@ module QA
             expect(job).to be_successful(timeout: 800)
           end
 
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = another_project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.add_files([
-                              gitlab_ci_install_yaml
-            ])
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = another_project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.add_files([
+                                gitlab_ci_install_yaml
+              ])
+            end
           end
 
           another_project.visit!
@@ -199,7 +203,7 @@ module QA
           Page::Project::Artifact::Show.perform do |artifacts|
             artifacts.go_to_directory('node_modules')
             artifacts.go_to_directory("@#{registry_scope}")
-            expect(artifacts).to have_content( "#{project.name}")
+            expect(artifacts).to have_content("#{project.name}")
           end
 
           project.visit!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
index 832f8c7f72c..cec902e073a 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb
@@ -16,13 +16,13 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::DeployToken.fabricate_via_browser_ui! do |deploy_token|
+        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
           deploy_token.name = 'npm-deploy-token'
           deploy_token.project = project
-          deploy_token.scopes = [
-            :read_repository,
-            :read_package_registry,
-            :write_package_registry
+          deploy_token.scopes = %w[
+            read_repository
+            read_package_registry
+            write_package_registry
           ]
         end
       end
@@ -91,7 +91,7 @@ module QA
           file_path: 'package.json',
           content: <<~JSON
             {
-              "name": "@#{registry_scope}/mypackage",
+              "name": "#{package.name}",
               "version": "1.0.0",
               "description": "Example package for GitLab npm registry",
               "publishConfig": {
@@ -129,11 +129,11 @@ module QA
           when :ci_job_token
             '${CI_JOB_TOKEN}'
           when :project_deploy_token
-            "\"#{project_deploy_token.password}\""
+            "\"#{project_deploy_token.token}\""
           end
         end
 
-        it "push and pull a npm package via CI using a #{params[:token_name]}", quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/344537', type: :investigating } do
+        it "push and pull a npm package via CI using a #{params[:token_name]}" do
           Resource::Repository::Commit.fabricate_via_api! do |commit|
             commit.project = project
             commit.commit_message = 'Add .gitlab-ci.yml'
@@ -168,7 +168,7 @@ module QA
           Page::Project::Artifact::Show.perform do |artifacts|
             artifacts.go_to_directory('node_modules')
             artifacts.go_to_directory("@#{registry_scope}")
-            expect(artifacts).to have_content("mypackage")
+            expect(artifacts).to have_content('mypackage')
           end
 
           project.visit!
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb
index 0b4825715c1..d63bf486f11 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/nuget_repository_spec.rb
@@ -9,6 +9,7 @@ module QA
         Resource::Project.fabricate_via_api! do |project|
           project.name = 'nuget-package-project'
           project.template_name = 'dotnetcore'
+          project.visibility = :private
         end
       end
 
@@ -21,9 +22,14 @@ module QA
       end
 
       let(:group_deploy_token) do
-        Resource::GroupDeployToken.fabricate_via_browser_ui! do |deploy_token|
+        Resource::GroupDeployToken.fabricate_via_api! do |deploy_token|
           deploy_token.name = 'nuget-group-deploy-token'
           deploy_token.group = project.group
+          deploy_token.scopes = %w[
+            read_repository
+            read_package_registry
+            write_package_registry
+          ]
         end
       end
 
@@ -70,7 +76,7 @@ module QA
           when :ci_job_token
             '${CI_JOB_TOKEN}'
           when :group_deploy_token
-            "\"#{group_deploy_token.password}\""
+            "\"#{group_deploy_token.token}\""
           end
         end
 
@@ -88,35 +94,37 @@ module QA
         it "publishes a nuget package at the project level, installs and deletes it at the group level using a #{params[:token_name]}" do
           Flow::Login.sign_in
 
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = project
-            commit.commit_message = 'Add .gitlab-ci.yml'
-            commit.update_files(
-              [
-                  {
-                      file_path: '.gitlab-ci.yml',
-                      content: <<~YAML
-                        image: mcr.microsoft.com/dotnet/sdk:5.0
-
-                        stages:
-                          - deploy
-
-                        deploy:
-                          stage: deploy
-                          script:
-                            - dotnet restore -p:Configuration=Release
-                            - dotnet build -c Release
-                            - dotnet pack -c Release -p:PackageID=#{package.name}
-                            - dotnet nuget add source "$CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/packages/nuget/index.json" --name gitlab --username #{auth_token_username} --password #{auth_token_password} --store-password-in-clear-text
-                            - dotnet nuget push "bin/Release/*.nupkg" --source gitlab
-                          rules:
-                            - if: '$CI_COMMIT_BRANCH == "#{project.default_branch}"'
-                          tags:
-                            - "runner-for-#{project.group.name}"
-                      YAML
-                  }
-              ]
-            )
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = project
+              commit.commit_message = 'Add .gitlab-ci.yml'
+              commit.update_files(
+                [
+                    {
+                        file_path: '.gitlab-ci.yml',
+                        content: <<~YAML
+                          image: mcr.microsoft.com/dotnet/sdk:5.0
+
+                          stages:
+                            - deploy
+
+                          deploy:
+                            stage: deploy
+                            script:
+                              - dotnet restore -p:Configuration=Release
+                              - dotnet build -c Release
+                              - dotnet pack -c Release -p:PackageID=#{package.name}
+                              - dotnet nuget add source "$CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/packages/nuget/index.json" --name gitlab --username #{auth_token_username} --password #{auth_token_password} --store-password-in-clear-text
+                              - dotnet nuget push "bin/Release/*.nupkg" --source gitlab
+                            rules:
+                              - if: '$CI_COMMIT_BRANCH == "#{project.default_branch}"'
+                            tags:
+                              - "runner-for-#{project.group.name}"
+                        YAML
+                    }
+                ]
+              )
+            end
           end
 
           project.visit!
@@ -132,50 +140,52 @@ module QA
 
           another_project.visit!
 
-          Resource::Repository::Commit.fabricate_via_api! do |commit|
-            commit.project = another_project
-            commit.commit_message = 'Add new csproj file'
-            commit.add_files(
-              [
-                  {
-                      file_path: 'otherdotnet.csproj',
-                      content: <<~EOF
-                          <Project Sdk="Microsoft.NET.Sdk">
-
-                            <PropertyGroup>
-                              <OutputType>Exe</OutputType>
-                              <TargetFramework>net5.0</TargetFramework>
-                            </PropertyGroup>
-
-                          </Project>
-                      EOF
-                  }
-              ]
-            )
-            commit.update_files(
-              [
-                  {
-                      file_path: '.gitlab-ci.yml',
-                      content: <<~YAML
-                          image: mcr.microsoft.com/dotnet/sdk:5.0
-
-                          stages:
-                            - install
-
-                          install:
-                            stage: install
-                            script:
-                            - dotnet nuget locals all --clear
-                            - dotnet nuget add source "$CI_SERVER_URL/api/v4/groups/#{another_project.group.id}/-/packages/nuget/index.json" --name gitlab --username #{auth_token_username} --password #{auth_token_password} --store-password-in-clear-text
-                            - "dotnet add otherdotnet.csproj package #{package.name} --version 1.0.0"
-                            only:
-                              - "#{another_project.default_branch}"
-                            tags:
-                              - "runner-for-#{project.group.name}"
-                      YAML
-                  }
-              ]
-            )
+          Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+            Resource::Repository::Commit.fabricate_via_api! do |commit|
+              commit.project = another_project
+              commit.commit_message = 'Add new csproj file'
+              commit.add_files(
+                [
+                    {
+                        file_path: 'otherdotnet.csproj',
+                        content: <<~EOF
+                            <Project Sdk="Microsoft.NET.Sdk">
+
+                              <PropertyGroup>
+                                <OutputType>Exe</OutputType>
+                                <TargetFramework>net5.0</TargetFramework>
+                              </PropertyGroup>
+
+                            </Project>
+                        EOF
+                    }
+                ]
+              )
+              commit.update_files(
+                [
+                    {
+                        file_path: '.gitlab-ci.yml',
+                        content: <<~YAML
+                            image: mcr.microsoft.com/dotnet/sdk:5.0
+
+                            stages:
+                              - install
+
+                            install:
+                              stage: install
+                              script:
+                              - dotnet nuget locals all --clear
+                              - dotnet nuget add source "$CI_SERVER_URL/api/v4/groups/#{another_project.group.id}/-/packages/nuget/index.json" --name gitlab --username #{auth_token_username} --password #{auth_token_password} --store-password-in-clear-text
+                              - "dotnet add otherdotnet.csproj package #{package.name} --version 1.0.0"
+                              only:
+                                - "#{another_project.default_branch}"
+                              tags:
+                                - "runner-for-#{project.group.name}"
+                        YAML
+                    }
+                ]
+              )
+            end
           end
 
           Flow::Pipeline.visit_latest_pipeline
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
index e727a89a584..2e7bd8fc5d7 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/pypi_repository_spec.rb
@@ -34,58 +34,60 @@ module QA
       before do
         Flow::Login.sign_in
 
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = project
-          commit.commit_message = 'Add .gitlab-ci.yml'
-          commit.add_files([{
-                                file_path: '.gitlab-ci.yml',
-                                content:
-                                    <<~YAML
-                                      image: python:latest
-                                      stages:
-                                        - run
-                                        - install
-
-                                      run:
-                                        stage: run
-                                        script:
-                                          - pip install twine
-                                          - python setup.py sdist bdist_wheel
-                                          - "TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --repository-url #{gitlab_address_with_port}/api/v4/projects/${CI_PROJECT_ID}/packages/pypi dist/*"
-                                        tags:
+        Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.project = project
+            commit.commit_message = 'Add .gitlab-ci.yml'
+            commit.add_files([{
+                                  file_path: '.gitlab-ci.yml',
+                                  content:
+                                      <<~YAML
+                                        image: python:latest
+                                        stages:
+                                          - run
+                                          - install
+
+                                        run:
+                                          stage: run
+                                          script:
+                                            - pip install twine
+                                            - python setup.py sdist bdist_wheel
+                                            - "TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python -m twine upload --repository-url #{gitlab_address_with_port}/api/v4/projects/${CI_PROJECT_ID}/packages/pypi dist/*"
+                                          tags:
+                                            - "runner-for-#{project.name}"
+                                        install:
+                                          stage: install
+                                          script:
+                                          - "pip install #{package.name} --no-deps --index-url #{uri.scheme}://#{personal_access_token}:#{personal_access_token}@#{gitlab_host_with_port}/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple --trusted-host #{gitlab_host_with_port}"
+                                          tags:
                                           - "runner-for-#{project.name}"
-                                      install:
-                                        stage: install
-                                        script:
-                                        - "pip install #{package.name} --no-deps --index-url #{uri.scheme}://#{personal_access_token}:#{personal_access_token}@#{gitlab_host_with_port}/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple --trusted-host #{gitlab_host_with_port}"
-                                        tags:
-                                        - "runner-for-#{project.name}"
-                                  
-                                    YAML
-                            },
-                            {
-                                file_path: 'setup.py',
-                                content:
-                                    <<~EOF
-                                      import setuptools
-
-                                      setuptools.setup(
-                                          name="#{package.name}",
-                                          version="0.0.1",
-                                          author="Example Author",
-                                          author_email="author@example.com",
-                                          description="A small example package",
-                                          packages=setuptools.find_packages(),
-                                          classifiers=[
-                                              "Programming Language :: Python :: 3",
-                                              "License :: OSI Approved :: MIT License",
-                                              "Operating System :: OS Independent",
-                                          ],
-                                          python_requires='>=3.6',
-                                      )
-                                    EOF
-
-                            }])
+                                    
+                                      YAML
+                              },
+                              {
+                                  file_path: 'setup.py',
+                                  content:
+                                      <<~EOF
+                                        import setuptools
+
+                                        setuptools.setup(
+                                            name="#{package.name}",
+                                            version="0.0.1",
+                                            author="Example Author",
+                                            author_email="author@example.com",
+                                            description="A small example package",
+                                            packages=setuptools.find_packages(),
+                                            classifiers=[
+                                                "Programming Language :: Python :: 3",
+                                                "License :: OSI Approved :: MIT License",
+                                                "Operating System :: OS Independent",
+                                            ],
+                                            python_requires='>=3.6',
+                                        )
+                                      EOF
+
+                              }])
+          end
         end
 
         project.visit!
@@ -117,7 +119,7 @@ module QA
       end
 
       context 'when at the project level' do
-        it 'publishes and installs a pypi package and deletes it', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1635' do
+        it 'publishes and installs a pypi package and deletes it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348015' do
           Page::Project::Menu.perform(&:click_packages_link)
 
           Page::Project::Packages::Index.perform do |index|
@@ -137,7 +139,7 @@ module QA
       end
 
       context 'Geo', :orchestrated, :geo do
-        it 'replicates a published pypi package to the Geo secondary site', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1219', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/325556', type: :investigating } do
+        it 'replicates a published pypi package to the Geo secondary site', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348090', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/325556', type: :investigating } do
           QA::Runtime::Logger.debug('Visiting the secondary Geo site')
 
           QA::Flow::Login.while_signed_in(address: :geo_secondary) do
diff --git a/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
index ecf14a25b8d..062d2b49deb 100644
--- a/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
+++ b/qa/qa/specs/features/browser_ui/5_package/package_registry/rubygems_registry_spec.rb
@@ -43,94 +43,96 @@ module QA
         project.remove_via_api!
       end
 
-      it 'publishes and deletes a Ruby gem', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1906' do
+      it 'publishes and deletes a Ruby gem', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347649' do
         Flow::Login.sign_in
 
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = project
-          commit.commit_message = 'Add package files'
-          commit.add_files(
-            [
-              {
-                file_path: '.gitlab-ci.yml',
-                content:
-                  <<~YAML
-                    image: ruby
-
-                    test_package:
-                      stage: deploy
-                      before_script:
-                        - mkdir ~/.gem
-                        - echo "---" > ~/.gem/credentials
-                        - |
-                          echo "#{gitlab_address_with_port}/api/v4/projects/${CI_PROJECT_ID}/packages/rubygems: '${CI_JOB_TOKEN}'" >> ~/.gem/credentials
-                        - chmod 0600 ~/.gem/credentials
-                      script:
-                        - gem build #{package.name}
-                        - gem push #{package.name}-0.0.1.gem --host #{gitlab_address_with_port}/api/v4/projects/${CI_PROJECT_ID}/packages/rubygems
-                      tags:
-                        - "runner-for-#{project.name}"
-                  YAML
-              },
-              {
-                file_path: 'lib/hello_gem.rb',
-                content:
-                  <<~RUBY
-                    class HelloWorld
-                      def self.hi
-                        puts "Hello world!"
+        Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
+          Resource::Repository::Commit.fabricate_via_api! do |commit|
+            commit.project = project
+            commit.commit_message = 'Add package files'
+            commit.add_files(
+              [
+                {
+                  file_path: '.gitlab-ci.yml',
+                  content:
+                    <<~YAML
+                      image: ruby
+
+                      test_package:
+                        stage: deploy
+                        before_script:
+                          - mkdir ~/.gem
+                          - echo "---" > ~/.gem/credentials
+                          - |
+                            echo "#{gitlab_address_with_port}/api/v4/projects/${CI_PROJECT_ID}/packages/rubygems: '${CI_JOB_TOKEN}'" >> ~/.gem/credentials
+                          - chmod 0600 ~/.gem/credentials
+                        script:
+                          - gem build #{package.name}
+                          - gem push #{package.name}-0.0.1.gem --host #{gitlab_address_with_port}/api/v4/projects/${CI_PROJECT_ID}/packages/rubygems
+                        tags:
+                          - "runner-for-#{project.name}"
+                    YAML
+                },
+                {
+                  file_path: 'lib/hello_gem.rb',
+                  content:
+                    <<~RUBY
+                      class HelloWorld
+                        def self.hi
+                          puts "Hello world!"
+                        end
                       end
-                    end
-                  RUBY
-              },
-              {
-                file_path: "#{package.name}.gemspec",
-                content:
-                  <<~RUBY
-                    # frozen_string_literal: true
-
-                    Gem::Specification.new do |s|
-                      s.name = '#{package.name}'
-                      s.authors = ['Tanuki Steve', 'Hal 9000']
-                      s.author = 'Tanuki Steve'
-                      s.version = '0.0.1'
-                      s.date = '2011-09-29'
-                      s.summary = 'this is a test package'
-                      s.files = ['lib/hello_gem.rb']
-                      s.require_paths = ['lib']
-
-                      s.description = 'A test package for GitLab.'
-                      s.email = 'tanuki@not_real.com'
-                      s.homepage = 'https://gitlab.com/ruby-co/my-package'
-                      s.license = 'MIT'
-
-                      s.metadata = {
-                        'bug_tracker_uri' => 'https://gitlab.com/ruby-co/my-package/issues',
-                        'changelog_uri' => 'https://gitlab.com/ruby-co/my-package/CHANGELOG.md',
-                        'documentation_uri' => 'https://gitlab.com/ruby-co/my-package/docs',
-                        'mailing_list_uri' => 'https://gitlab.com/ruby-co/my-package/mailme',
-                        'source_code_uri' => 'https://gitlab.com/ruby-co/my-package'
-                      }
-
-                      s.bindir = 'bin'
-                      s.platform = Gem::Platform::RUBY
-                      s.post_install_message = 'Installed, thank you!'
-                      s.rdoc_options = ['--main']
-                      s.required_ruby_version = '>= 2.7.0'
-                      s.required_rubygems_version = '>= 1.8.11'
-                      s.requirements = 'A high powered server or calculator'
-                      s.rubygems_version = '1.8.09'
-
-                      s.add_dependency 'dependency_1', '~> 1.2.3'
-                      s.add_dependency 'dependency_2', '3.0.0'
-                      s.add_dependency 'dependency_3', '>= 1.0.0'
-                      s.add_dependency 'dependency_4'
-                    end
-
-                  RUBY
-              }
-            ]
-          )
+                    RUBY
+                },
+                {
+                  file_path: "#{package.name}.gemspec",
+                  content:
+                    <<~RUBY
+                      # frozen_string_literal: true
+
+                      Gem::Specification.new do |s|
+                        s.name = '#{package.name}'
+                        s.authors = ['Tanuki Steve', 'Hal 9000']
+                        s.author = 'Tanuki Steve'
+                        s.version = '0.0.1'
+                        s.date = '2011-09-29'
+                        s.summary = 'this is a test package'
+                        s.files = ['lib/hello_gem.rb']
+                        s.require_paths = ['lib']
+
+                        s.description = 'A test package for GitLab.'
+                        s.email = 'tanuki@not_real.com'
+                        s.homepage = 'https://gitlab.com/ruby-co/my-package'
+                        s.license = 'MIT'
+
+                        s.metadata = {
+                          'bug_tracker_uri' => 'https://gitlab.com/ruby-co/my-package/issues',
+                          'changelog_uri' => 'https://gitlab.com/ruby-co/my-package/CHANGELOG.md',
+                          'documentation_uri' => 'https://gitlab.com/ruby-co/my-package/docs',
+                          'mailing_list_uri' => 'https://gitlab.com/ruby-co/my-package/mailme',
+                          'source_code_uri' => 'https://gitlab.com/ruby-co/my-package'
+                        }
+
+                        s.bindir = 'bin'
+                        s.platform = Gem::Platform::RUBY
+                        s.post_install_message = 'Installed, thank you!'
+                        s.rdoc_options = ['--main']
+                        s.required_ruby_version = '>= 2.7.0'
+                        s.required_rubygems_version = '>= 1.8.11'
+                        s.requirements = 'A high powered server or calculator'
+                        s.rubygems_version = '1.8.09'
+
+                        s.add_dependency 'dependency_1', '~> 1.2.3'
+                        s.add_dependency 'dependency_2', '3.0.0'
+                        s.add_dependency 'dependency_3', '>= 1.0.0'
+                        s.add_dependency 'dependency_4'
+                      end
+
+                    RUBY
+                }
+              ]
+            )
+          end
         end
 
         project.visit!
diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb
index 8878b719a21..260c812420c 100644
--- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb
@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Release' do
     describe 'Deploy key creation' do
-      it 'user adds a deploy key', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1602' do
+      it 'user adds a deploy key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348023' do
         Flow::Login.sign_in
 
         key = Runtime::Key::RSA.new
diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb
index 81ccc585cf9..9811453605e 100644
--- a/qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb
@@ -3,20 +3,20 @@
 module QA
   RSpec.describe 'Release' do
     describe 'Deploy token creation' do
-      it 'user adds a deploy token', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1582' do
+      it 'user adds a deploy token', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348028' do
         Flow::Login.sign_in
 
         deploy_token_name = 'deploy token name'
         one_week_from_now = Date.today + 7
 
-        deploy_token = Resource::DeployToken.fabricate_via_browser_ui! do |resource|
+        deploy_token = Resource::ProjectDeployToken.fabricate_via_api! do |resource|
           resource.name = deploy_token_name
           resource.expires_at = one_week_from_now
-          resource.scopes = [:read_repository]
+          resource.scopes = %w[read_repository]
         end
 
         expect(deploy_token.username.length).to be > 0
-        expect(deploy_token.password.length).to be > 0
+        expect(deploy_token.token.length).to be > 0
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/6_release/pages/pages_pipeline_spec.rb b/qa/qa/specs/features/browser_ui/6_release/pages/pages_pipeline_spec.rb
index 97f52ea7ec1..d1d2340e5f1 100644
--- a/qa/qa/specs/features/browser_ui/6_release/pages/pages_pipeline_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/pages/pages_pipeline_spec.rb
@@ -31,7 +31,7 @@ module QA
         pipeline.visit!
       end
 
-      it 'runs a Pages-specific pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1879' do
+      it 'runs a Pages-specific pipeline', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347669' do
         Page::Project::Pipeline::Show.perform do |show|
           expect(show).to have_job(:pages)
           show.click_job(:pages)
diff --git a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb
index 46640b1a540..e34f41b4c95 100644
--- a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb
@@ -25,7 +25,7 @@ module QA
         runner.remove_via_api!
       end
 
-      it 'parent pipelines passes if child passes', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1198' do
+      it 'parent pipelines passes if child passes', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348092' do
         add_ci_files(success_child_ci_file)
         Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'completed')
 
@@ -35,7 +35,7 @@ module QA
         end
       end
 
-      it 'parent pipeline fails if child fails', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1199' do
+      it 'parent pipeline fails if child fails', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348091' do
         add_ci_files(fail_child_ci_file)
         Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'completed')
 
diff --git a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb
index dac89663f84..74a81ff429d 100644
--- a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb
@@ -25,7 +25,7 @@ module QA
         runner.remove_via_api!
       end
 
-      it 'parent pipelines passes if child passes', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1191' do
+      it 'parent pipelines passes if child passes', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348093' do
         add_ci_files(success_child_ci_file)
         Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'completed')
 
@@ -35,7 +35,7 @@ module QA
         end
       end
 
-      it 'parent pipeline passes even if child fails', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1190' do
+      it 'parent pipeline passes even if child fails', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348094' do
         add_ci_files(fail_child_ci_file)
         Flow::Pipeline.visit_latest_pipeline(pipeline_condition: 'completed')
 
diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index e20b76f6bf8..70321dcafe4 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
@@ -22,7 +22,7 @@ module QA
           project.remove_via_api!
         end
 
-        it 'runs auto devops', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1422' do
+        it 'runs auto devops', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348061' do
           Flow::Login.sign_in
 
           Resource::KubernetesCluster::ProjectCluster.fabricate! do |k8s_cluster|
diff --git a/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb
index b928eae62e6..94f9e9ec1f6 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/kubernetes/kubernetes_integration_spec.rb
@@ -20,7 +20,7 @@ module QA
           cluster.remove!
         end
 
-        it 'can create and associate a project cluster', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1419' do
+        it 'can create and associate a project cluster', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348062' do
           Resource::KubernetesCluster::ProjectCluster.fabricate_via_browser_ui! do |k8s_cluster|
             k8s_cluster.project = project
             k8s_cluster.cluster = cluster
diff --git a/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb b/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb
index 14bd6af815e..c13d2d2dddf 100644
--- a/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb
+++ b/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb
@@ -10,13 +10,13 @@ module QA
       @project.visit!
     end
 
-    it 'configures custom metrics', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1334' do
+    it 'configures custom metrics', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348082' do
       verify_add_custom_metric
       verify_edit_custom_metric
       verify_delete_custom_metric
     end
 
-    it 'duplicates to create dashboard to custom', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1335' do
+    it 'duplicates to create dashboard to custom', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348070' do
       Page::Project::Menu.perform(&:go_to_monitor_metrics)
 
       Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
@@ -27,7 +27,7 @@ module QA
       end
     end
 
-    it 'verifies data on filtered deployed environment', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1332' do
+    it 'verifies data on filtered deployed environment', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348071' do
       Page::Project::Menu.perform(&:go_to_monitor_metrics)
 
       Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
@@ -37,7 +37,7 @@ module QA
       end
     end
 
-    it 'filters using the quick range', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1333' do
+    it 'filters using the quick range', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348083' do
       Page::Project::Menu.perform(&:go_to_monitor_metrics)
 
       Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
@@ -52,7 +52,7 @@ module QA
       end
     end
 
-    it 'observes cluster health graph', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1311' do
+    it 'observes cluster health graph', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348074' do
       Page::Project::Menu.perform(&:go_to_infrastructure_kubernetes)
 
       Page::Project::Infrastructure::Kubernetes::Index.perform do |cluster_list|
@@ -65,7 +65,7 @@ module QA
       end
     end
 
-    it 'uses templating variables for metrics dashboards', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1926' do
+    it 'uses templating variables for metrics dashboards', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347636' do
       templating_dashboard_yml = Pathname
                                      .new(__dir__)
                                      .join('../../../../fixtures/metrics_dashboards/templating.yml')
diff --git a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
deleted file mode 100644
index 9d84658da76..00000000000
--- a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  RSpec.describe 'Non-devops' do
-    describe 'Performance bar display', :requires_admin, :skip_live_env do
-      context 'when logged in as an admin user' do
-        # performance metrics: pg, gitaly, redis, rugged (feature flagged), total (not always provided)
-        let(:minimum_metrics_count) { 3 }
-
-        before do
-          Flow::Login.sign_in_as_admin
-          Page::Main::Menu.perform(&:go_to_admin_area)
-          Page::Admin::Menu.perform(&:go_to_metrics_and_profiling_settings)
-
-          Page::Admin::Settings::MetricsAndProfiling.perform do |setting|
-            setting.expand_performance_bar do |page|
-              page.enable_performance_bar
-              page.save_settings
-            end
-          end
-        end
-
-        it 'shows results for the original request and AJAX requests', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1545' do
-          # Issue pages always make AJAX requests
-          Resource::Issue.fabricate_via_browser_ui! do |issue|
-            issue.title = 'Performance bar test'
-          end
-
-          Page::Layout::PerformanceBar.perform do |bar_component|
-            expect(bar_component).to have_performance_bar
-            expect(bar_component).to have_detailed_metrics(minimum_metrics_count)
-            expect(bar_component).to have_request_for('realtime_changes') # Always requested on issue pages
-          end
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.1