1 files changed, 13 insertions, 11 deletions
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!