From e00b8bc6374988c4bf01404e9bdb1f2376175b91 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Tue, 8 Oct 2024 11:22:39 +0200
Subject: [PATCH] Consistently run all CI steps with the same user.

See #1883
---
 Jenkinsfile | 3 ++-
 ci/test.sh  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2ccabaaea7..381561ba41 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -101,7 +101,7 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
 							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
 								"./mvnw -s settings.xml -Pci,artifactory " +
 								"-Dartifactory.server=${p['artifactory.url']} " +
@@ -110,6 +110,7 @@ pipeline {
 								"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
 								"-Dartifactory.build-name=spring-data-relational " +
 								"-Dartifactory.build-number=spring-data-relational-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
+								"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc " +
 								"-Dmaven.test.skip=true clean deploy -U -B"
 						}
 					}
diff --git a/ci/test.sh b/ci/test.sh
index fdaaecf9c5..3c65151576 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -9,7 +9,6 @@ cp spring-data-relational/src/test/java/org/springframework/data/ProxyImageNameS
 cp spring-data-relational/src/test/java/org/springframework/data/ProxyImageNameSubstitutor.java spring-data-r2dbc/src/test/java/org/springframework/data
 
 mkdir -p /tmp/jenkins-home
-chown -R 1001:1001 .
 
 export JENKINS_USER=${JENKINS_USER_NAME}