Introduce property for Jenkins user and Artifactory server details.

Closes #2787
spring-projects · Nov 27, 2023 · fb95f96 · fb95f96
1 parent 8b57795
commit fb95f96
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -81,7 +81,7 @@ pipeline {
 			steps {
 				script {
 					docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
-						sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
+						sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
 					}
 				}
 			}
@@ -107,7 +107,7 @@ pipeline {
 					steps {
 						script {
 							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
-								sh 'PROFILE=runtimehints LONG_TESTS=false ci/test.sh'
+								sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
 							}
 						}
 					}
@@ -123,7 +123,7 @@ pipeline {
 					steps {
 						script {
 							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
-								sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
+								sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
 							}
 						}
 					}
@@ -151,14 +151,15 @@ pipeline {
 			steps {
 				script {
 					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
-								'-Dartifactory.server=https://repo.spring.io ' +
+						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']} " +
 								"-Dartifactory.username=${ARTIFACTORY_USR} " +
 								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-								"-Dartifactory.staging-repository=libs-snapshot-local " +
+								"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
 								"-Dartifactory.build-name=spring-data-redis " +
 								"-Dartifactory.build-number=${BUILD_NUMBER} " +
-								'-Dmaven.test.skip=true clean deploy -U -B'
+								"-Dmaven.test.skip=true clean deploy -U -B"
 					}
 				}
 			}

diff --git a/ci/pipeline.properties b/ci/pipeline.properties
@@ -25,3 +25,6 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
 docker.registry=
 docker.credentials=hub.docker.com-springbuildmaster
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
+artifactory.url=https://repo.spring.io
+artifactory.repository.snapshot=libs-snapshot-local
+jenkins.user.name=spring-builds+jenkins
diff --git a/ci/test.sh b/ci/test.sh
@@ -10,8 +10,10 @@ cwd=$(pwd)
 # Launch Redis in proper configuration
 pushd /tmp && ln -s /work && make -f $cwd/Makefile start && popd
 
+export JENKINS_USER=${JENKINS_USER_NAME}
+
 # Execute maven test
-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -U -B
+MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -U -B
 
 # Capture resulting exit code from maven (pass/fail)
 RESULT=$?