Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

16 files changed, 96 insertions, 2 deletions

diff --git a/qa/qa/fixtures/package_managers/maven/build_install.gradle.erb b/qa/qa/fixtures/package_managers/maven/gradle/build_install.gradle.erb
index 31543d30e88..31543d30e88 100644
--- a/qa/qa/fixtures/package_managers/maven/build_install.gradle.erb
+++ b/qa/qa/fixtures/package_managers/maven/gradle/build_install.gradle.erb
diff --git a/qa/qa/fixtures/package_managers/maven/build_upload.gradle.erb b/qa/qa/fixtures/package_managers/maven/gradle/build_upload.gradle.erb
index c14e63e11df..c14e63e11df 100644
--- a/qa/qa/fixtures/package_managers/maven/build_upload.gradle.erb
+++ b/qa/qa/fixtures/package_managers/maven/gradle/build_upload.gradle.erb
diff --git a/qa/qa/fixtures/package_managers/maven/gradle_install_package.yaml.erb b/qa/qa/fixtures/package_managers/maven/gradle/gradle_install_package.yaml.erb
index 49873f124cc..49873f124cc 100644
--- a/qa/qa/fixtures/package_managers/maven/gradle_install_package.yaml.erb
+++ b/qa/qa/fixtures/package_managers/maven/gradle/gradle_install_package.yaml.erb
diff --git a/qa/qa/fixtures/package_managers/maven/gradle_upload_package.yaml.erb b/qa/qa/fixtures/package_managers/maven/gradle/gradle_upload_package.yaml.erb
index 3f3c7dce03c..3f3c7dce03c 100644
--- a/qa/qa/fixtures/package_managers/maven/gradle_upload_package.yaml.erb
+++ b/qa/qa/fixtures/package_managers/maven/gradle/gradle_upload_package.yaml.erb
diff --git a/qa/qa/fixtures/package_managers/maven/maven_install_package.yaml.erb b/qa/qa/fixtures/package_managers/maven/group/consumer/gitlab_ci.yaml.erb
index 78d6255e9a9..78d6255e9a9 100644
--- a/qa/qa/fixtures/package_managers/maven/maven_install_package.yaml.erb
+++ b/qa/qa/fixtures/package_managers/maven/group/consumer/gitlab_ci.yaml.erb
diff --git a/qa/qa/fixtures/package_managers/maven/client_pom.xml.erb b/qa/qa/fixtures/package_managers/maven/group/consumer/pom.xml.erb
index 20bb5f3964e..adc8b0294b3 100644
--- a/qa/qa/fixtures/package_managers/maven/client_pom.xml.erb
+++ b/qa/qa/fixtures/package_managers/maven/group/consumer/pom.xml.erb
@@ -5,8 +5,8 @@
   <modelVersion>4.0.0</modelVersion>
   <repositories>
     <repository>
-      <id><%= package_project.name %></id>
-      <url><%= gitlab_address_with_port %>/api/v4/groups/<%= package_project.group.id %>/-/packages/maven</url>
+      <id><%= client_project.name %></id>
+      <url><%= gitlab_address_with_port %>/api/v4/groups/<%= client_project.group.id %>/-/packages/maven</url>
     </repository>
   </repositories>
   <dependencies>
diff --git a/qa/qa/fixtures/package_managers/maven/group/consumer/settings.xml.erb b/qa/qa/fixtures/package_managers/maven/group/consumer/settings.xml.erb
new file mode 100644
index 00000000000..fb7e2a4af88
--- /dev/null
+++ b/qa/qa/fixtures/package_managers/maven/group/consumer/settings.xml.erb
@@ -0,0 +1,16 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+<servers>
+  <server>
+    <id><%= client_project.name %></id>
+    <configuration>
+      <httpHeaders>
+        <property>
+          <name><%= maven_header_name %></name>
+          <value><%= token %></value>
+        </property>
+      </httpHeaders>
+    </configuration>
+  </server>
+</servers>
+</settings>
\ No newline at end of file
diff --git a/qa/qa/fixtures/package_managers/maven/maven_upload_package.yaml.erb b/qa/qa/fixtures/package_managers/maven/group/producer/gitlab_ci.yaml.erb
index 64a63bf0bd8..64a63bf0bd8 100644
--- a/qa/qa/fixtures/package_managers/maven/maven_upload_package.yaml.erb
+++ b/qa/qa/fixtures/package_managers/maven/group/producer/gitlab_ci.yaml.erb
diff --git a/qa/qa/fixtures/package_managers/maven/package_pom.xml.erb b/qa/qa/fixtures/package_managers/maven/group/producer/pom.xml.erb
index 5159172a170..5159172a170 100644
--- a/qa/qa/fixtures/package_managers/maven/package_pom.xml.erb
+++ b/qa/qa/fixtures/package_managers/maven/group/producer/pom.xml.erb
diff --git a/qa/qa/fixtures/package_managers/maven/settings.xml.erb b/qa/qa/fixtures/package_managers/maven/group/producer/settings.xml.erb
index b670b83cf85..b670b83cf85 100644
--- a/qa/qa/fixtures/package_managers/maven/settings.xml.erb
+++ b/qa/qa/fixtures/package_managers/maven/group/producer/settings.xml.erb
diff --git a/qa/qa/fixtures/package_managers/maven/settings_with_pat.xml.erb b/qa/qa/fixtures/package_managers/maven/group/settings_with_pat.xml.erb
index 611c232819f..611c232819f 100644
--- a/qa/qa/fixtures/package_managers/maven/settings_with_pat.xml.erb
+++ b/qa/qa/fixtures/package_managers/maven/group/settings_with_pat.xml.erb
diff --git a/qa/qa/fixtures/package_managers/maven/project/gitlab_ci.yaml.erb b/qa/qa/fixtures/package_managers/maven/project/gitlab_ci.yaml.erb
new file mode 100644
index 00000000000..44186e92ba7
--- /dev/null
+++ b/qa/qa/fixtures/package_managers/maven/project/gitlab_ci.yaml.erb
@@ -0,0 +1,9 @@
+deploy-and-install:
+  image: maven:3.6-jdk-11
+  script:
+    - 'mvn deploy -s settings.xml'
+    - 'mvn install -s settings.xml'
+  only:
+    - "<%= package_project.default_branch %>"
+  tags:
+    - "runner-for-<%= package_project.name %>"
\ No newline at end of file
diff --git a/qa/qa/fixtures/package_managers/maven/project/pom.xml.erb b/qa/qa/fixtures/package_managers/maven/project/pom.xml.erb
new file mode 100644
index 00000000000..5159172a170
--- /dev/null
+++ b/qa/qa/fixtures/package_managers/maven/project/pom.xml.erb
@@ -0,0 +1,22 @@
+ <project>
+  <groupId><%= group_id %></groupId>
+  <artifactId><%= artifact_id %></artifactId>
+  <version><%= package_version %></version>
+  <modelVersion>4.0.0</modelVersion>
+  <repositories>
+    <repository>
+      <id><%= package_project.name %></id>
+      <url><%= gitlab_address_with_port %>/api/v4/groups/<%= package_project.group.id %>/-/packages/maven</url>
+    </repository>
+  </repositories>
+  <distributionManagement>
+    <repository>
+      <id><%= package_project.name %></id>
+      <url><%= gitlab_address_with_port %>/api/v4/projects/<%= package_project.id %>/packages/maven</url>
+    </repository>
+    <snapshotRepository>
+      <id><%= package_project.name %></id>
+      <url><%= gitlab_address_with_port %>/api/v4/projects/<%= package_project.id %>/packages/maven</url>
+    </snapshotRepository>
+  </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/qa/qa/fixtures/package_managers/maven/project/request_forwarding/gitlab_ci.yaml.erb b/qa/qa/fixtures/package_managers/maven/project/request_forwarding/gitlab_ci.yaml.erb
new file mode 100644
index 00000000000..a41bdc4d650
--- /dev/null
+++ b/qa/qa/fixtures/package_managers/maven/project/request_forwarding/gitlab_ci.yaml.erb
@@ -0,0 +1,8 @@
+install:
+  image: maven:3.6-jdk-11
+  script:
+    - 'mvn install -U -s settings.xml'
+  only:
+    - "<%= imported_project.default_branch %>"
+  tags:
+    - "runner-for-<%= imported_project.name %>"
\ No newline at end of file
diff --git a/qa/qa/fixtures/package_managers/maven/project/request_forwarding/settings.xml.erb b/qa/qa/fixtures/package_managers/maven/project/request_forwarding/settings.xml.erb
new file mode 100644
index 00000000000..caf1fc9b761
--- /dev/null
+++ b/qa/qa/fixtures/package_managers/maven/project/request_forwarding/settings.xml.erb
@@ -0,0 +1,23 @@
+<settings>
+  <servers>
+    <server>
+      <id>central-proxy</id>
+      <configuration>
+        <httpHeaders>
+          <property>
+            <name>Private-Token</name>
+            <value><%= personal_access_token %></value>
+          </property>
+        </httpHeaders>
+      </configuration>
+    </server>
+  </servers>
+  <mirrors>
+    <mirror>
+      <id>central-proxy</id>
+      <name>GitLab proxy of central repo</name>
+      <url><%= gitlab_address_with_port %>/api/v4/projects/<%= imported_project.id %>/packages/maven</url>
+      <mirrorOf>central</mirrorOf>
+    </mirror>
+  </mirrors>
+</settings>
diff --git a/qa/qa/fixtures/package_managers/maven/project/settings.xml.erb b/qa/qa/fixtures/package_managers/maven/project/settings.xml.erb
new file mode 100644
index 00000000000..b670b83cf85
--- /dev/null
+++ b/qa/qa/fixtures/package_managers/maven/project/settings.xml.erb
@@ -0,0 +1,16 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+<servers>
+  <server>
+    <id><%= package_project.name %></id>
+    <configuration>
+      <httpHeaders>
+        <property>
+          <name><%= maven_header_name %></name>
+          <value><%= token %></value>
+        </property>
+      </httpHeaders>
+    </configuration>
+  </server>
+</servers>
+</settings>
\ No newline at end of file