Skip to content

Commit 02fd507

Browse files
committed
Use Docker in Docker CI setup.
See #2994
1 parent 60f3955 commit 02fd507

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Jenkinsfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pipeline {
8282
steps {
8383
script {
8484
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']) {
8686
sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
8787
}
8888
}
@@ -111,7 +111,7 @@ pipeline {
111111
steps {
112112
script {
113113
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']) {
115115
sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
116116
}
117117
}
@@ -130,7 +130,7 @@ pipeline {
130130
steps {
131131
script {
132132
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']) {
134134
sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
135135
}
136136
}
@@ -161,15 +161,17 @@ pipeline {
161161
steps {
162162
script {
163163
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']) {
165165
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
166166
"./mvnw -s settings.xml -Pci,artifactory " +
167+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
167168
"-Dartifactory.server=${p['artifactory.url']} " +
168169
"-Dartifactory.username=${ARTIFACTORY_USR} " +
169170
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
170171
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
171172
"-Dartifactory.build-name=spring-data-redis " +
172173
"-Dartifactory.build-number=spring-data-redis-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
174+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-redis " +
173175
"-Dmaven.test.skip=true clean deploy -U -B"
174176
}
175177
}

ci/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pushd /tmp && ln -s /work && make -f $cwd/Makefile start && popd
1313
export JENKINS_USER=${JENKINS_USER_NAME}
1414

1515
# Execute maven test
16-
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
16+
MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-redis clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -U -B
1717

1818
# Capture resulting exit code from maven (pass/fail)
1919
RESULT=$?

0 commit comments

Comments
 (0)