File tree 4 files changed +5
-10
lines changed
4 files changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -101,15 +101,17 @@ pipeline {
101
101
steps {
102
102
script {
103
103
docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
104
- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic ' ]) {
104
+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker ' ]) {
105
105
sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
106
106
" ./mvnw -s settings.xml -Pci,artifactory " +
107
+ " -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
107
108
" -Dartifactory.server=${ p['artifactory.url']} " +
108
109
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
109
110
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
110
111
" -Dartifactory.staging-repository=${ p['artifactory.repository.snapshot']} " +
111
112
" -Dartifactory.build-name=spring-data-relational " +
112
113
" -Dartifactory.build-number=spring-data-relational-${ BRANCH_NAME} -build-${ BUILD_NUMBER} " +
114
+ " -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc " +
113
115
" -Dmaven.test.skip=true clean deploy -U -B"
114
116
}
115
117
}
Original file line number Diff line number Diff line change @@ -5,4 +5,4 @@ set -euo pipefail
5
5
export JENKINS_USER=${JENKINS_USER_NAME}
6
6
7
7
MAVEN_OPTS=" -Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
8
- ./mvnw -s settings.xml -Dscan=false clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc
8
+ ./mvnw -s settings.xml -Dscan=false clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -9,10 +9,9 @@ cp spring-data-relational/src/test/java/org/springframework/data/ProxyImageNameS
9
9
cp spring-data-relational/src/test/java/org/springframework/data/ProxyImageNameSubstitutor.java spring-data-r2dbc/src/test/java/org/springframework/data
10
10
11
11
mkdir -p /tmp/jenkins-home
12
- chown -R 1001:1001 .
13
12
14
13
export JENKINS_USER=${JENKINS_USER_NAME}
15
14
16
15
MAVEN_OPTS=" -Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
17
16
./mvnw -s settings.xml \
18
- -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc
17
+ -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
You can’t perform that action at this time.
0 commit comments