diff --git a/Jenkinsfile b/Jenkinsfile index fee4df0a007..9d7c1439181 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 fdaaecf9c53..3c65151576c 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}