Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

20 files changed, 284 insertions, 324 deletions

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/gitlab_migration_group_spec.rb
index 74125b092b8..a18e22f52f1 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/gitlab_migration_group_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Manage', :requires_admin do
-    describe 'Bulk group import' do
-      let!(:staging?) { Runtime::Scenario.gitlab_address.include?('staging.gitlab.com') }
+  describe 'Manage', :requires_admin do
+    describe 'Gitlab migration' do
       let!(:admin_api_client) { Runtime::API::Client.as_admin }
       let!(:user) do
         Resource::User.fabricate_via_api! do |usr|
@@ -32,7 +31,7 @@ module QA
         Resource::BulkImportGroup.init do |group|
           group.api_client = api_client
           group.sandbox = sandbox
-          group.source_group_path = source_group.path
+          group.source_group = source_group
         end
       end
 
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 16f8df5a90d..098c0b3ba63 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
@@ -64,6 +64,7 @@ module QA
             Page::Profile::Accounts::Show.perform do |show|
               show.delete_account(user.password)
             end
+            Support::Waiter.wait_until { !user.exists? }
           end
 
           it 'allows recreating with same credentials', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347868' do
@@ -83,7 +84,7 @@ module QA
           end
 
           after do
-            @recreated_user.remove_via_api!
+            @recreated_user&.remove_via_api!
           end
 
           def admin_api_client
@@ -117,11 +118,12 @@ module QA
 
           Flow::Login.sign_in(as: @user, skip_page_validation: true)
 
-          Page::Registration::Welcome.perform(&:click_get_started_button_if_available)
+          Flow::UserOnboarding.onboard_user
 
-          Page::Main::Menu.perform do |menu|
-            expect(menu).to have_personal_area
-          end
+          # In development env and .com the user is asked to create a group and a project which can be skipped for
+          # the purpose of this test
+          Runtime::Browser.visit(:gitlab, Page::Dashboard::Welcome)
+          Page::Main::Menu.perform(&:has_personal_area?)
         end
 
         after do
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 6d09c8b1316..895027a588d 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
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Manage', :requires_admin do
+  RSpec.describe 'Manage', :requires_admin, quarantine: {
+    issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/350598',
+    type: :needs_update,
+    only: { subdomain: :staging }
+  } do
     describe 'Add project member' do
       before do
         Runtime::Feature.enable(:invite_members_group_modal)
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 7f40818da03..0063ce2613a 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
@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Manage', :smoke do
-    describe 'Project', :requires_admin do
+    describe 'Project' do
       shared_examples 'successful project creation' do
         it 'creates a new project' do
           Page::Project::Show.perform do |project_page|
@@ -17,7 +17,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(:paginatable_namespace_drop_down_for_project_creation)
         Flow::Login.sign_in
         project
       end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/invite_group_to_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/invite_group_to_project_spec.rb
new file mode 100644
index 00000000000..6997447411a
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/invite_group_to_project_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module QA
+  # Tagging with issue for a transient invite group modal search bug, but does not require quarantine at this time
+  RSpec.describe 'Manage', :requires_admin, :transient, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/349379' do
+    describe 'Invite group' do
+      shared_examples 'invites group to project' do
+        it 'verifies group is added and members can access project with correct access level' do
+          Page::Project::Menu.perform(&:click_members)
+          Page::Project::Members.perform do |project_members|
+            project_members.invite_group(group.path, 'Developer')
+
+            expect(project_members).to have_group(group.path)
+          end
+
+          Flow::Login.sign_in(as: @user)
+
+          Page::Dashboard::Projects.perform do |projects|
+            expect(projects).to have_project_with_access_role(project.name, 'Developer')
+          end
+
+          project.visit!
+
+          Page::Project::Show.perform do |project_page|
+            expect(project_page).to have_name(project.name)
+          end
+        end
+      end
+
+      before(:context) do
+        Runtime::Feature.enable(:invite_members_group_modal)
+        @user = Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
+
+      before do
+        Flow::Login.sign_in
+        group.add_member(@user, Resource::Members::AccessLevel::MAINTAINER)
+        project.visit!
+      end
+
+      context 'to personal namespace project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349223' do
+        let(:group) do
+          Resource::Group.fabricate_via_api! do |group|
+            group.path = "group-for-personal-project-#{SecureRandom.hex(8)}"
+          end
+        end
+
+        let(:project) do
+          Resource::Project.fabricate_via_api! do |project|
+            project.name = 'personal-namespace-project'
+            project.personal_namespace = Runtime::User.username
+            project.visibility = :private
+            project.description = 'test personal namespace project'
+          end
+        end
+
+        it_behaves_like 'invites group to project'
+      end
+
+      context 'to group project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349340' do
+        let(:group) do
+          Resource::Group.fabricate_via_api! do |group|
+            group.path = "group-for-group-project-#{SecureRandom.hex(8)}"
+          end
+        end
+
+        let(:project) do
+          Resource::Project.fabricate_via_api! do |project|
+            project.name = 'group-project'
+            project.visibility = :private
+            project.description = 'test group project'
+          end
+        end
+
+        it_behaves_like 'invites group to project'
+      end
+
+      after do
+        project&.remove_via_api!
+        group&.remove_via_api!
+      end
+
+      after(:context) do
+        Runtime::Feature.disable(:invite_members_group_modal)
+      end
+    end
+  end
+end
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 be8567ee0b6..c2bd61155b1 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
@@ -9,7 +9,7 @@ module QA
         expect(project_access_token.token).not_to be_nil
 
         project_access_token.revoke_via_ui!
-        expect(page).to have_text("Revoked project access token #{project_access_token.name}!")
+        expect(page).to have_text("Revoked access token #{project_access_token.name}!")
       end
 
       after do
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 43100929acd..87b51edef08 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
@@ -19,7 +19,7 @@ module QA
         group = QA::Resource::Group.fabricate_via_api! do |group|
           group.path = "group_for_follow_user_activity_#{SecureRandom.hex(8)}"
         end
-        group.add_member(user)
+        group.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
         group
       end
 
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 d198d79c5fe..b0c6d01e8ca 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
@@ -2,7 +2,11 @@
 
 module QA
   RSpec.describe 'Create' do
-    describe 'Merge request creation from fork' do
+    describe 'Merge request creation from fork', quarantine: {
+      only: { subdomain: %i[canary production] },
+      issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/343801",
+      type: :investigation
+    } do
       let(:merge_request) do
         Resource::MergeRequestFromFork.fabricate_via_browser_ui! do |merge_request|
           merge_request.fork_branch = 'feature-branch'
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
deleted file mode 100644
index 0785b32b225..00000000000
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_merge_ref_diff_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  RSpec.describe 'Create', :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/261793', type: :investigating } do
-    describe 'View merge request merge-ref diff' do
-      let(:project) do
-        Resource::Project.fabricate_via_api! do |project|
-          project.name = 'merge-ref-diff'
-        end
-      end
-
-      let(:merge_request) do
-        Resource::MergeRequest.fabricate_via_api! do |merge_request|
-          merge_request.project = project
-          merge_request.title = 'This is a merge request'
-          merge_request.description = '... for viewing merge-ref and merge-base diffs'
-          merge_request.file_content = 'This exists on the source branch only'
-        end
-      end
-
-      let(:new_file_name) { "added_file-#{SecureRandom.hex(8)}.txt" }
-
-      context 'when the feature flag default_merge_ref_for_diffs is enabled' do
-        before do
-          Runtime::Feature.enable('default_merge_ref_for_diffs', project: project)
-
-          commit_to_branch(merge_request.target_branch, new_file_name)
-          commit_to_branch(merge_request.source_branch, new_file_name)
-
-          Flow::Login.sign_in
-
-          merge_request.visit!
-        end
-
-        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
-
-            expect(mr_page.version_dropdown_content).to include("#{project.default_branch} (HEAD)")
-            expect(mr_page.version_dropdown_content).not_to include("#{project.default_branch} (base)")
-            expect(mr_page).to have_file(merge_request.file_name)
-            expect(mr_page).not_to have_file(new_file_name)
-          end
-        end
-      end
-
-      context 'when the feature flag default_merge_ref_for_diffs is disabled' do
-        before do
-          Runtime::Feature.disable('default_merge_ref_for_diffs', project: project)
-
-          commit_to_branch(merge_request.target_branch, new_file_name)
-          commit_to_branch(merge_request.source_branch, new_file_name)
-
-          Flow::Login.sign_in
-
-          merge_request.visit!
-        end
-
-        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
-
-            expect(mr_page.version_dropdown_content).to include("#{project.default_branch} (HEAD)")
-            expect(mr_page.version_dropdown_content).to include("#{project.default_branch} (base)")
-            expect(mr_page).to have_file(merge_request.file_name)
-            expect(mr_page).to have_file(new_file_name)
-          end
-        end
-      end
-
-      def commit_to_branch(branch, file)
-        Resource::Repository::Commit.fabricate_via_api! do |commit|
-          commit.project = merge_request.project
-          commit.branch = branch
-          commit.commit_message = "Add new file on #{branch}"
-          commit.add_files(
-            [
-                {
-                    file_path: file,
-                    content: "This exists on source and target branches"
-                }
-            ]
-          )
-        end
-      end
-    end
-  end
-end
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 a98925eab98..0bd470fcb77 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
@@ -24,8 +24,6 @@ module QA
           proj.initialize_with_readme = true
         end
 
-        Runtime::Feature.enable(:delete_branch_confirmation_modals, project: project)
-
         master_branch = project.default_branch
 
         Git::Repository.perform do |repository|
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 a063acbe146..67eee66b3d6 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,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  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
+  RSpec.describe 'Create', :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/350220', type: :investigating } 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' }
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_lint_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_lint_spec.rb
new file mode 100644
index 00000000000..8f3284662d7
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_editor_lint_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Verify' do
+    describe 'Pipeline editor' do
+      let(:project) do
+        Resource::Project.fabricate_via_api! do |project|
+          project.name = 'pipeline-editor-project'
+        end
+      end
+
+      let!(:commit) 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
+                  stages:
+                    - stage1
+                    - stage2
+
+                  job1:
+                    stage: stage1
+                    script: echo 'Done.'
+
+                  job2:
+                    stage: stage2
+                    script: echo 'Done.'
+                YAML
+              }
+            ]
+          )
+        end
+      end
+
+      before do
+        Flow::Login.sign_in
+        project.visit!
+        Page::Project::Menu.perform(&:go_to_pipeline_editor)
+      end
+
+      after do
+        project&.remove_via_api!
+      end
+
+      context 'when CI has valid syntax' do
+        it 'shows valid validations', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349128' do
+          Page::Project::PipelineEditor::Show.perform do |show|
+            aggregate_failures do
+              expect(show.ci_syntax_validate_message).to have_content('CI configuration is valid')
+
+              show.go_to_visualize_tab
+              { stage1: 'job1', stage2: 'job2' }.each_pair do |stage, job|
+                expect(show).to have_stage(stage), "Pipeline graph does not have stage #{stage}."
+                expect(show).to have_job(job), "Pipeline graph does not have job #{job}."
+              end
+
+              show.go_to_lint_tab
+              expect(show.tab_alert_message).to have_content('Syntax is correct')
+
+              show.go_to_view_merged_yaml_tab
+              expect(show).to have_source_editor
+            end
+          end
+        end
+      end
+
+      context 'when CI has invalid syntax' do
+        it 'shows invalid validations', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349129' do
+          invalid_msg = 'syntax is invalid'
+
+          Page::Project::PipelineEditor::Show.perform do |show|
+            show.write_to_editor(SecureRandom.hex(10))
+
+            aggregate_failures do
+              show.go_to_visualize_tab
+              expect(show.tab_alert_message).to have_content(invalid_msg)
+
+              show.go_to_lint_tab
+              expect(show.tab_alert_message).to have_content('Syntax is incorrect')
+
+              show.go_to_view_merged_yaml_tab
+              expect(show.tab_alert_message).to have_content(invalid_msg)
+
+              expect(show.ci_syntax_validate_message).to have_content('CI configuration is invalid')
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/update_ci_file_with_pipeline_editor_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/update_ci_file_with_pipeline_editor_spec.rb
new file mode 100644
index 00000000000..00c5d4c74d4
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/update_ci_file_with_pipeline_editor_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Verify' do
+    describe 'Update CI file with 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'
+        end
+      end
+
+      let!(:runner) do
+        Resource::Runner.fabricate_via_api! do |runner|
+          runner.project = project
+          runner.name = random_test_string
+          runner.tags = [random_test_string]
+        end
+      end
+
+      let!(:commit) 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
+                  test_job:
+                    tags: ['#{random_test_string}']
+                    script:
+                      - echo "Simple test!"
+                YAML
+              }
+            ]
+          )
+        end
+      end
+
+      before do
+        Flow::Login.sign_in
+        project.visit!
+        Support::Waiter.wait_until { !project.pipelines.empty? && project.pipelines.first[:status] == 'success' }
+        Page::Project::Menu.perform(&:go_to_pipeline_editor)
+      end
+
+      after do
+        [runner, project].each(&:remove_via_api!)
+      end
+
+      it 'creates new pipeline and target branch', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349005' do
+        Page::Project::PipelineEditor::Show.perform do |show|
+          show.write_to_editor(random_test_string)
+          show.set_target_branch(random_test_string)
+          show.submit_changes
+
+          Support::Waiter.wait_until { project.pipelines.size > 1 }
+
+          aggregate_failures do
+            expect(show.target_branch_name).to eq(random_test_string)
+            expect(show.current_branch).to eq(random_test_string)
+            expect(show.editing_content).to have_content(random_test_string)
+            expect { show.pipeline_id }.to eventually_eq(project.pipelines.pluck(:id).max).within(max_duration: 60, sleep_interval: 3)
+          end
+        end
+
+        expect(project).to have_branch(random_test_string)
+      end
+    end
+  end
+end
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 e8d936e67b1..56e3ec82388 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
@@ -2,8 +2,7 @@
 
 module QA
   RSpec.describe 'Package' do
-    # TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed
-    describe 'Container Registry Online Garbage Collection', :registry_gc, :requires_admin, only: { subdomain: %i[pre] } do
+    describe 'Container Registry Online Garbage Collection', :registry_gc, only: { subdomain: %i[pre] } do
       let(:group) { Resource::Group.fabricate_via_api! }
 
       let(:imported_project) do
@@ -65,8 +64,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(:paginatable_namespace_drop_down_for_project_creation)
-
         Flow::Login.sign_in
 
         imported_project
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 c58cdec622d..70b31c1beca 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
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package Registry', :orchestrated, :packages, :reliable, :object_storage do
+  RSpec.describe 'Package Registry', :orchestrated, :packages, :object_storage do
     describe 'npm instance level endpoint' do
       using RSpec::Parameterized::TableSyntax
       include Runtime::Fixtures
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 cec902e073a..e25a742493b 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
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Package Registry', :orchestrated, :packages, :reliable, :object_storage do
+  RSpec.describe 'Package Registry', :orchestrated, :packages, :object_storage do
     describe 'npm project level endpoint' do
       using RSpec::Parameterized::TableSyntax
       include Runtime::Fixtures
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 74a81ff429d..ef0c8d35c37 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
@@ -13,7 +13,7 @@ module QA
         Resource::Runner.fabricate_via_api! do |runner|
           runner.project = project
           runner.name = project.name
-          runner.tags = ["#{project.name}"]
+          runner.tags = [project.name]
         end
       end
 
diff --git a/qa/qa/specs/features/browser_ui/8_monitor/.gitkeep b/qa/qa/specs/features/browser_ui/8_monitor/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/8_monitor/.gitkeep
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
deleted file mode 100644
index c13d2d2dddf..00000000000
--- a/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb
+++ /dev/null
@@ -1,142 +0,0 @@
-# frozen_string_literal: true
-require_relative 'cluster_with_prometheus'
-
-module QA
-  RSpec.describe 'Monitor', :orchestrated, :kubernetes, :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/241448', type: :investigating } do
-    include_context "cluster with Prometheus installed"
-
-    before do
-      Flow::Login.sign_in_unless_signed_in
-      @project.visit!
-    end
-
-    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/gitlab/-/quality/test_cases/348070' do
-      Page::Project::Menu.perform(&:go_to_monitor_metrics)
-
-      Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
-        on_dashboard.duplicate_dashboard
-
-        expect(on_dashboard).to have_metrics
-        expect(on_dashboard).to have_edit_dashboard_enabled
-      end
-    end
-
-    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|
-        on_dashboard.filter_environment
-
-        expect(on_dashboard).to have_metrics
-      end
-    end
-
-    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|
-        on_dashboard.show_last('30 minutes')
-        expect(on_dashboard).to have_metrics
-
-        on_dashboard.show_last('3 hours')
-        expect(on_dashboard).to have_metrics
-
-        on_dashboard.show_last('1 day')
-        expect(on_dashboard).to have_metrics
-      end
-    end
-
-    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|
-        cluster_list.click_on_cluster(@cluster)
-      end
-
-      Page::Project::Infrastructure::Kubernetes::Show.perform do |cluster_panel|
-        cluster_panel.open_health
-        cluster_panel.wait_for_cluster_health
-      end
-    end
-
-    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')
-
-      Resource::Repository::ProjectPush.fabricate! do |push|
-        push.project = @project
-        push.file_name = '.gitlab/dashboards/templating.yml'
-        push.file_content = File.read(templating_dashboard_yml)
-        push.commit_message = 'Add templating in dashboard file'
-        push.new_branch = false
-      end
-
-      Page::Project::Menu.perform(&:go_to_monitor_metrics)
-
-      Page::Project::Monitor::Metrics::Show.perform do |dashboard|
-        dashboard.select_dashboard('templating.yml')
-
-        expect(dashboard).to have_template_metric('CPU usage GitLab Runner')
-        expect(dashboard).to have_template_metric('Memory usage Postgresql')
-        expect(dashboard).to have_templating_variable('GitLab Runner')
-        expect(dashboard).to have_templating_variable('Postgresql')
-      end
-    end
-
-    private
-
-    def verify_add_custom_metric
-      Page::Project::Menu.perform(&:go_to_integrations_settings)
-      Page::Project::Settings::Integrations.perform(&:click_on_prometheus_integration)
-
-      Page::Project::Settings::Services::Prometheus.perform do |metrics_panel|
-        metrics_panel.click_on_new_metric
-        metrics_panel.add_custom_metric
-      end
-
-      Page::Project::Menu.perform(&:go_to_monitor_metrics)
-
-      Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
-        expect(on_dashboard).to have_custom_metric('HTTP Requests Total')
-      end
-    end
-
-    def verify_edit_custom_metric
-      Page::Project::Menu.perform(&:go_to_integrations_settings)
-      Page::Project::Settings::Integrations.perform(&:click_on_prometheus_integration)
-      Page::Project::Settings::Services::Prometheus.perform do |metrics_panel|
-        metrics_panel.click_on_custom_metric('Business / HTTP Requests Total (req/sec)')
-        metrics_panel.edit_custom_metric
-      end
-
-      Page::Project::Menu.perform(&:go_to_monitor_metrics)
-
-      Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
-        expect(on_dashboard).to have_custom_metric('Throughput')
-      end
-    end
-
-    def verify_delete_custom_metric
-      Page::Project::Menu.perform(&:go_to_integrations_settings)
-      Page::Project::Settings::Integrations.perform(&:click_on_prometheus_integration)
-
-      Page::Project::Settings::Services::Prometheus.perform do |metrics_panel|
-        metrics_panel.click_on_custom_metric('Business / Throughput (req/sec)')
-        metrics_panel.delete_custom_metric
-      end
-
-      Page::Project::Menu.perform(&:go_to_monitor_metrics)
-
-      Page::Project::Monitor::Metrics::Show.perform do |on_dashboard|
-        expect(on_dashboard).not_to have_custom_metric('Throughput')
-      end
-    end
-  end
-end
diff --git a/qa/qa/specs/features/browser_ui/8_monitor/cluster_with_prometheus.rb b/qa/qa/specs/features/browser_ui/8_monitor/cluster_with_prometheus.rb
deleted file mode 100644
index 19e49400d5e..00000000000
--- a/qa/qa/specs/features/browser_ui/8_monitor/cluster_with_prometheus.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  RSpec.shared_context "cluster with Prometheus installed" do
-    before :all do
-      @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create!
-      @project = Resource::Project.fabricate_via_api! do |project|
-        project.name = 'monitoring-project'
-        project.auto_devops_enabled = true
-        project.template_name = 'express'
-      end
-
-      deploy_project_with_prometheus
-    end
-
-    def deploy_project_with_prometheus
-      %w[
-          CODE_QUALITY_DISABLED TEST_DISABLED LICENSE_MANAGEMENT_DISABLED
-          SAST_DISABLED DAST_DISABLED DEPENDENCY_SCANNING_DISABLED
-          CONTAINER_SCANNING_DISABLED BROWSER_PERFORMANCE_DISABLED SECRET_DETECTION_DISABLED
-        ].each do |key|
-        Resource::CiVariable.fabricate_via_api! do |resource|
-          resource.project = @project
-          resource.key = key
-          resource.value = '1'
-          resource.masked = false
-        end
-      end
-
-      Flow::Login.sign_in
-
-      Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings|
-        cluster_settings.project = @project
-        cluster_settings.cluster = @cluster
-        cluster_settings.install_runner = true
-        cluster_settings.install_ingress = true
-        cluster_settings.install_prometheus = true
-      end
-
-      Resource::Pipeline.fabricate_via_api! do |pipeline|
-        pipeline.project = @project
-      end.visit!
-
-      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: 600)
-
-        job.click_element(:pipeline_path)
-      end
-
-      Page::Project::Pipeline::Show.perform do |pipeline|
-        pipeline.click_job('production')
-      end
-      Page::Project::Job::Show.perform do |job|
-        expect(job).to be_successful(timeout: 1200)
-
-        job.click_element(:pipeline_path)
-      end
-    end
-
-    after :all do
-      @cluster&.remove!
-    end
-  end
-end