Merge branch 'revert-cc090fbe' into 'master'

Revert "Merge branch 'parallel-retry-rate3' into 'master'"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169189



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Désirée Chevalier <dchevalier@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>

qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb

@@ -5,7 +5,9 @@ module QA
     describe 'Email Notification' do
       include Support::API
-      let!(:user) { create(:user) }
+      let!(:user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       let(:project) { create(:project, name: 'email-notification-test') }
@@ -13,10 +15,6 @@ module QA
         Flow::Login.sign_in
       end
-      after do
-        user.remove_via_api!
-      end
-
       it 'is received by a user for project invitation', :blocking, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347961' do
         project.visit!

qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb

@@ -3,7 +3,9 @@
 module QA
   RSpec.describe 'Plan', :smoke, product_group: :project_management do
     describe 'mention' do
-      let(:user) { create(:user) }
+      let(:user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       let(:project) do
         Resource::Project.fabricate_via_api_unless_fips! do |project|
@@ -38,10 +40,6 @@ module QA
         end
       end
-      after do
-        user.remove_via_api!
-      end
-
       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|

qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb

@@ -3,8 +3,8 @@
 module QA
   RSpec.describe 'Plan', product_group: :project_management do
     describe 'Assignees' do
-      let(:user1) { create(:user) }
-      let(:user2) { create(:user) }
+      let(:user1) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
+      let(:user2) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2) }
       let(:project) { create(:project, name: 'project-to-test-assignees') }
       before do
@@ -14,11 +14,6 @@ module QA
         project.add_member(user2)
       end
-      after do
-        user1.remove_via_api!
-        user2.remove_via_api!
-      end
-
       it 'update without refresh', :blocking, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347941' do
         issue = create(:issue, project: project, assignee_ids: [user1.id])
         issue.visit!

qa/qa/specs/features/browser_ui/2_plan/transient/comment_on_discussion_spec.rb

@@ -3,7 +3,9 @@
 module QA
   RSpec.describe 'Plan', :transient, product_group: :project_management do
     describe 'Discussion comments transient bugs' do
-      let(:user1) { create(:user) }
+      let(:user1) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       let(:my_first_reply) { 'This is my first reply' }
       let(:my_second_reply) { "@#{Runtime::Env.gitlab_qa_username_1}" }
@@ -14,10 +16,6 @@ module QA
         Flow::Login.sign_in
       end
-      after do
-        user1.remove_via_api!
-      end
-
       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}")

qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/batch_suggestion_spec.rb

@@ -14,7 +14,9 @@ module QA
           ))
       end
-      let(:dev_user) { create(:user) }
+      let(:dev_user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       before do
         project.add_member(dev_user)
@@ -36,10 +38,6 @@ module QA
         merge_request.visit!
       end
-      after do
-        dev_user.remove_via_api!
-      end
-
       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

qa/qa/specs/features/browser_ui/3_create/merge_request/suggestions/custom_commit_suggestion_spec.rb

@@ -15,7 +15,9 @@ module QA
           ))
       end
-      let(:dev_user) { create(:user) }
+      let(:dev_user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       before do
         project.add_member(dev_user)
@@ -32,10 +34,6 @@ module QA
         merge_request.visit!
       end
-      after do
-        dev_user.remove_via_api!
-      end
-
       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|

qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb

@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Create', :orchestrated, :repository_storage, :requires_admin, product_group: :source_code do
     describe 'Gitaly repository storage' do
-      let(:user) { create(:user) }
+      let(:user) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
       let(:parent_project) { create(:project, :with_readme, name: 'parent-project') }
       let(:fork_project) { create(:fork, user: user, upstream: parent_project).project }
@@ -11,10 +11,6 @@ module QA
         parent_project.add_member(user)
       end
-      after do
-        user.remove_via_api!
-      end
-
       it 'creates a 2nd fork after moving the parent project',
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347787',
         quarantine: {

qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb

@@ -8,9 +8,13 @@ module QA
       only: { job: /gdk-qa-.*/ }
     } do
       let(:project) { create(:project, :with_readme, name: 'project-for-tags') }
-      let(:developer_user) { create(:user) }
-      let(:maintainer_user) { create(:user) }
+      let(:developer_user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
+      let(:maintainer_user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2)
+      end
       let(:tag_name) { 'v0.0.1' }
       let(:tag_message) { 'Version 0.0.1' }

qa/qa/specs/features/browser_ui/3_create/snippet/add_comment_to_snippet_spec.rb

@@ -3,7 +3,7 @@
 module QA
   RSpec.describe 'Create', product_group: :source_code do
     describe 'Adding comments on snippets', :blocking do
-      let(:comment_author) { create(:user) }
+      let(:comment_author) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
       let(:comment_content) { 'Comment 123' }
       let(:edited_comment_content) { 'Nice snippet!' }
@@ -23,10 +23,6 @@ module QA
         Flow::Login.sign_in
       end
-      after do
-        comment_author.remove_via_api!
-      end
-
       shared_examples 'comments on snippets' do |snippet_type, testcase|
         it "adds, edits, and deletes a comment on a #{snippet_type}", testcase: testcase do
           send(snippet_type)

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

@@ -22,9 +22,13 @@ module QA
         ])
       end
-      let(:developer) { create(:user) }
-      let(:maintainer) { create(:user) }
+      let(:developer) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
+      let(:maintainer) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2)
+      end
       before do
         Flow::Login.sign_in
@@ -35,8 +39,6 @@ module QA
       end
       after do
-        developer.remove_via_api!
-        maintainer.remove_via_api!
         runner.remove_via_api!
       end

qa/qa/specs/features/browser_ui/9_data_stores/project/invite_group_to_project_spec.rb

@@ -30,7 +30,9 @@ module QA
         end
       end
-      let(:user) { create(:user) }
+      let(:user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       before do
         Flow::Login.sign_in
@@ -38,10 +40,6 @@ module QA
         project.visit!
       end
-      after do
-        user.remove_via_api!
-      end
-
       context 'with a personal namespace project',
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349223' do
         let(:group) { create(:group, path: "group-for-personal-project-#{SecureRandom.hex(8)}") }

qa/qa/specs/features/browser_ui/9_data_stores/project/project_owner_permissions_spec.rb

@@ -3,11 +3,15 @@
 module QA
   RSpec.describe 'Data Stores' do
     describe 'Project owner permissions', :smoke, product_group: :tenant_scale do
-      let!(:owner) { create(:user) }
+      let!(:owner) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       let!(:owner_api_client) { Runtime::API::Client.new(:gitlab, user: owner) }
-      let!(:maintainer) { create(:user) }
+      let!(:maintainer) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2)
+      end
       shared_examples 'adds user as owner' do |project_type, testcase|
         let!(:issue) do

qa/qa/specs/features/ee/browser_ui/10_govern/group/group_audit_logs_1_spec.rb

@@ -32,17 +32,15 @@ module QA
       let(:group) { create(:group, path: "test-group-#{SecureRandom.hex(8)}") }
       let(:project) { create(:project, name: 'project-shared-with-group') }
-      let(:user) { create(:user) }
+      let(:user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       # rubocop:disable RSpec/InstanceVariable
       before do
         @event_count = get_audit_event_count(group)
       end
-      after do
-        user.remove_via_api!
-      end
-
       context 'for add group', :blocking,
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347910' do
         before do

qa/qa/specs/features/ee/browser_ui/10_govern/project/project_audit_logs_spec.rb

@@ -18,16 +18,14 @@ module QA
     describe 'Project', :blocking do
       let(:project) { create(:project, :with_readme, name: 'awesome-project') }
-      let(:user) { create(:user) }
+      let(:user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       before do
         sign_in
       end
-      after do
-        user.remove_via_api!
-      end
-
       context "for add project", testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347904' do
         before do
           Resource::Project.fabricate_via_browser_ui! do |project|

qa/qa/specs/features/ee/browser_ui/10_govern/scan_result_policy_license_finding_spec.rb

@@ -30,7 +30,9 @@ module QA
       let(:dependency_scan_fixtures) { Pathname.new(EE::Runtime::Path.fixture('dependency_scanning_fixtures')) }
       let(:commit_branch) { "new_branch_#{SecureRandom.hex(8)}" }
-      let!(:approver) { create(:user) }
+      let!(:approver) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       let(:scan_result_policy_commit) do
         QA::EE::Resource::ScanResultPolicyCommit.fabricate_via_api! do |commit|
@@ -83,7 +85,6 @@ module QA
       end
       after do
-        approver.remove_via_api!
         runner.remove_via_api!
         project.remove_via_api!
       end

qa/qa/specs/features/ee/browser_ui/10_govern/scan_result_policy_vulnerabilities_spec.rb

@@ -35,7 +35,9 @@ module QA
       let(:premade_report_name) { "gl-container-scanning-report.json" }
       let(:premade_report_path) { "qa/ee/fixtures/secure_premade_reports/gl-container-scanning-report.json" }
       let(:commit_branch) { "new_branch_#{SecureRandom.hex(8)}" }
-      let!(:approver) { create(:user) }
+      let!(:approver) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       let(:scan_result_policy_commit) do
         EE::Resource::ScanResultPolicyCommit.fabricate_via_api! do |commit|
@@ -59,7 +61,6 @@ module QA
       end
       after do
-        approver.remove_via_api!
         runner.remove_via_api!
       end

qa/qa/specs/features/ee/browser_ui/2_plan/issue_boards/read_only_board_configuration_spec.rb

@@ -3,7 +3,9 @@
 module QA
   RSpec.describe 'Plan', :blocking, product_group: :project_management do
     describe 'Read-only board configuration' do
-      let(:qa_user) { create(:user) }
+      let(:qa_user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       let(:label_board_list) do
         EE::Resource::Board::BoardList::Project::LabelBoardList.fabricate_via_api!
@@ -20,10 +22,6 @@ module QA
         Page::Project::Menu.perform(&:go_to_issue_boards)
       end
-      after do
-        qa_user.remove_via_api!
-      end
-
       it 'shows board configuration to user without edit permission', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347959' do
         Page::Component::IssueBoard::Show.perform do |show|
           show.click_boards_config_button

qa/qa/specs/features/ee/browser_ui/3_create/merge_request/approval_rules_spec.rb

@@ -7,8 +7,8 @@ module QA
       issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/423899',
       only: { pipeline: %i[canary production] }
     } do
-      let(:approver1) { create(:user) }
-      let(:approver2) { create(:user) }
+      let(:approver1) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
+      let(:approver2) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2) }
       let(:project) { create(:project, name: 'approval-rules') }
       def login(user = nil)
@@ -27,8 +27,6 @@ def login(user = nil)
         # Cleanup so that retries can start fresh
         project&.group&.remove_member(approver2)
         project&.remove_via_api!
-        approver1.remove_via_api!
-        approver2.remove_via_api!
       end
       it 'allows multiple approval rules with users and groups', :blocking, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347771' do

qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb

@@ -4,8 +4,8 @@ module QA
   RSpec.describe 'Create' do
     describe 'Codeowners', product_group: :source_code do
       # Create one user to be the assigned approver and another user who will not be an approver
-      let(:approver) { create(:user) }
-      let(:non_approver) { create(:user) }
+      let(:approver) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
+      let(:non_approver) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2) }
       let(:project) { create(:project, :with_readme, name: 'assign-approvers') }
       let(:branch_name) { 'protected-branch' }
@@ -18,11 +18,6 @@ module QA
         project.visit!
       end
-      after do
-        approver.remove_via_api!
-        non_approver.remove_via_api!
-      end
-
       it 'merge request assigns code owners as approvers', :blocking,
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347776' do
         # Commit CODEOWNERS to default branch

qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb

@@ -18,9 +18,13 @@ module QA
       let(:project) { create(:project, name: 'codeowners') }
-      let(:user) { create(:user) }
-      let(:user2) { create(:user) }
+      let(:user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
+      let(:user2) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2)
+      end
       let(:codeowners_file_content) do
         <<-CONTENT
@@ -42,11 +46,6 @@ module QA
         ])
       end
-      after do
-        user.remove_via_api!
-        user2.remove_via_api!
-      end
-
       it 'displays owners specified in CODEOWNERS file',
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347763' do
         project.visit!