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/ee/browser_ui/3_create/repository/file_locking_spec.rb

@@ -3,9 +3,13 @@
 module QA
   RSpec.describe 'Create' do
     describe 'File Locking', product_group: :source_code do
-      let(:user_one) { create(:user) }
-      let(:user_two) { create(:user) }
+      let(:user_one) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
+      let(:user_two) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2)
+      end
       let(:project) { create(:project, :with_readme, name: 'file_locking') }
@@ -28,11 +32,6 @@ module QA
         end
       end
-      after do
-        user_one.remove_via_api!
-        user_two.remove_via_api!
-      end
-
       it 'locks a directory and tries to push as a second user', :blocking,
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347768' do
         push as_user: user_one, max_attempts: 3, branch: project.default_branch, file: 'directory/file'

qa/qa/specs/features/ee/browser_ui/9_data_stores/group/share_group_with_group_spec.rb

@@ -8,7 +8,9 @@ module QA
       let!(:project) { create(:project, :with_readme, group: target_group_with_project) }
-      let(:maintainer_user) { create(:user) }
+      let(:maintainer_user) do
+        Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
       before do
         source_group_with_members.add_member(maintainer_user, Resource::Members::AccessLevel::MAINTAINER)
@@ -18,7 +20,6 @@ module QA
         project.remove_via_api!
         source_group_with_members.remove_via_api!
         target_group_with_project.remove_via_api!
-        maintainer_user.remove_via_api!
       end
       it 'can be shared with another group with correct access level', :blocking,