Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 32 insertions, 115 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 57e1aa6a087..45693ecee41 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
@@ -13,80 +13,10 @@ module QA
       let(:package_version) { '1.3.7' }
       let(:package_type) { 'maven_gradle' }
 
-      let(:package_gitlab_ci_file) do
-        {
-          file_path: '.gitlab-ci.yml',
-          content:
-              <<~YAML
-                deploy:
-                  image: gradle:6.5-jdk11
-                  script:
-                  - 'gradle publish'
-                  only:
-                  - "#{package_project.default_branch}"
-                  tags:
-                  - "runner-for-#{package_project.group.name}"
-              YAML
-        }
-      end
-
-      let(:package_build_gradle_file) do
-        {
-          file_path: 'build.gradle',
-          content:
-              <<~EOF
-                plugins {
-                    id 'java'
-                    id 'maven-publish'
-                }
-
-                publishing {
-                    publications {
-                        library(MavenPublication) {
-                            groupId '#{group_id}'
-                            artifactId '#{artifact_id}'
-                            version '#{package_version}'
-                            from components.java
-                        }
-                    }
-                    repositories {
-                        maven {
-                            url "#{gitlab_address_with_port}/api/v4/projects/#{package_project.id}/packages/maven"
-                            credentials(HttpHeaderCredentials) {
-                                name = "Private-Token"
-                                value = "#{personal_access_token}"
-                            }
-                            authentication {
-                                header(HttpHeaderAuthentication)
-                            }
-                        }
-                    }
-                }
-              EOF
-        }
-      end
-
-      let(:client_gitlab_ci_file) do
-        {
-          file_path: '.gitlab-ci.yml',
-          content:
-              <<~YAML
-                build:
-                  image: gradle:6.5-jdk11
-                  script:
-                  - 'gradle build'
-                  only:
-                  - "#{client_project.default_branch}"
-                  tags:
-                  - "runner-for-#{client_project.group.name}"
-              YAML
-        }
-      end
-
-      where(:authentication_token_type, :maven_header_name) do
-        :personal_access_token | 'Private-Token'
-        :ci_job_token          | 'Job-Token'
-        :project_deploy_token  | 'Deploy-Token'
+      where(:case_name, :authentication_token_type, :maven_header_name, :testcase) do
+        'using personal access token' | :personal_access_token | 'Private-Token' | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347601'
+        'using ci job token'          | :ci_job_token          | 'Job-Token'     | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347603'
+        'using project deploy token'  | :project_deploy_token  | 'Deploy-Token'  | 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347602'
       end
 
       with_them do
@@ -101,49 +31,24 @@ module QA
           end
         end
 
-        let(:client_build_gradle_file) do
-          {
-            file_path: 'build.gradle',
-            content:
-                <<~EOF
-                  plugins {
-                      id 'java'
-                      id 'application'
-                  }
-
-                  repositories {
-                      jcenter()
-                      maven {
-                          url "#{gitlab_address_with_port}/api/v4/projects/#{package_project.id}/packages/maven"
-                          name "GitLab"
-                          credentials(HttpHeaderCredentials) {
-                              name = '#{maven_header_name}'
-                              value = #{token}
-                          }
-                          authentication {
-                              header(HttpHeaderAuthentication)
-                          }
-                      }
-                  }
-
-                  dependencies {
-                      implementation group: '#{group_id}', name: '#{artifact_id}', version: '#{package_version}'
-                      testImplementation 'junit:junit:4.12'
-                  }
-
-                  application {
-                    mainClassName = 'gradle_maven_app.App'
-                  }
-                EOF
-          }
-        end
-
-        it "pushes and pulls a maven package via gradle using #{params[:authentication_token_type]}" do
+        it 'pushes and pulls a maven package via gradle', testcase: params[:testcase] do
           Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
             Resource::Repository::Commit.fabricate_via_api! do |commit|
+              gradle_upload_yaml = ERB.new(read_fixture('package_managers/maven', 'gradle_upload_package.yaml.erb')).result(binding)
+              build_upload_gradle = ERB.new(read_fixture('package_managers/maven', 'build_upload.gradle.erb')).result(binding)
+
               commit.project = package_project
               commit.commit_message = 'Add .gitlab-ci.yml'
-              commit.add_files([package_gitlab_ci_file, package_build_gradle_file])
+              commit.add_files([
+                                {
+                                  file_path: '.gitlab-ci.yml',
+                                  content: gradle_upload_yaml
+                                },
+                                {
+                                  file_path: 'build.gradle',
+                                  content: build_upload_gradle
+                                }
+                ])
             end
           end
 
@@ -173,9 +78,21 @@ module QA
 
           Support::Retrier.retry_on_exception(max_attempts: 3, sleep_interval: 2) do
             Resource::Repository::Commit.fabricate_via_api! do |commit|
+              gradle_install_yaml = ERB.new(read_fixture('package_managers/maven', 'gradle_install_package.yaml.erb')).result(binding)
+              build_install_gradle = ERB.new(read_fixture('package_managers/maven', 'build_install.gradle.erb')).result(binding)
+
               commit.project = client_project
-              commit.commit_message = 'Add .gitlab-ci.yml'
-              commit.add_files([client_gitlab_ci_file, client_build_gradle_file])
+              commit.commit_message = 'Add files'
+              commit.add_files([
+                                {
+                                  file_path: '.gitlab-ci.yml',
+                                  content: gradle_install_yaml
+                                },
+                                {
+                                  file_path: 'build.gradle',
+                                  content: build_install_gradle
+                                }
+            ])
             end
           end