@@ -82,7 +82,7 @@ pipeline {
82
82
steps {
83
83
script {
84
84
docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
85
- docker. image(" springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
85
+ docker. image(" springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " ). inside(p[ ' docker.java.inside.docker ' ] ) {
86
86
sh " PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/test.sh"
87
87
}
88
88
}
@@ -111,7 +111,7 @@ pipeline {
111
111
steps {
112
112
script {
113
113
docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
114
- docker. image(" springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
114
+ docker. image(" springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " ). inside(p[ ' docker.java.inside.docker ' ] ) {
115
115
sh " PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/test.sh"
116
116
}
117
117
}
@@ -130,7 +130,7 @@ pipeline {
130
130
steps {
131
131
script {
132
132
docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
133
- docker. image(" springci/spring-data-with-redis-6.2:${ p['java.next.tag']} " ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
133
+ docker. image(" springci/spring-data-with-redis-6.2:${ p['java.next.tag']} " ). inside(p[ ' docker.java.inside.docker ' ] ) {
134
134
sh " PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/test.sh"
135
135
}
136
136
}
@@ -161,15 +161,17 @@ pipeline {
161
161
steps {
162
162
script {
163
163
docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
164
- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic ' ]) {
164
+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker ' ]) {
165
165
sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
166
166
" ./mvnw -s settings.xml -Pci,artifactory " +
167
+ " -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
167
168
" -Dartifactory.server=${ p['artifactory.url']} " +
168
169
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
169
170
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
170
171
" -Dartifactory.staging-repository=${ p['artifactory.repository.snapshot']} " +
171
172
" -Dartifactory.build-name=spring-data-redis " +
172
173
" -Dartifactory.build-number=spring-data-redis-${ BRANCH_NAME} -build-${ BUILD_NUMBER} " +
174
+ " -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-redis " +
173
175
" -Dmaven.test.skip=true clean deploy -U -B"
174
176
}
175
177
}
0 commit comments