@@ -36,12 +36,10 @@ pipeline {
3636 }
3737 steps {
3838 script {
39- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
40- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
41- sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
42- sh ' PROFILE=all-dbs ci/test.sh'
43- sh " ci/clean.sh"
44- }
39+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
40+ sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
41+ sh ' PROFILE=all-dbs ci/test.sh'
42+ sh " ci/clean.sh"
4543 }
4644 }
4745 }
@@ -66,10 +64,8 @@ pipeline {
6664 }
6765 steps {
6866 script {
69- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
70- docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.basic' ]) {
71- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
72- }
67+ docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.basic' ]) {
68+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
7369 }
7470 }
7571 }
@@ -85,10 +81,8 @@ pipeline {
8581 }
8682 steps {
8783 script {
88- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
89- docker. image(p[' docker.java.lts.image' ]). inside(p[' docker.java.inside.basic' ]) {
90- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
91- }
84+ docker. image(p[' docker.java.lts.image' ]). inside(p[' docker.java.inside.basic' ]) {
85+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
9286 }
9387 }
9488 }
@@ -115,17 +109,15 @@ pipeline {
115109
116110 steps {
117111 script {
118- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
119- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
120- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
121- ' -Dartifactory.server=https://repo.spring.io ' +
122- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
123- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
124- " -Dartifactory.staging-repository=libs-snapshot-local " +
125- " -Dartifactory.build-name=spring-data-jpa " +
126- " -Dartifactory.build-number=${ BUILD_NUMBER} " +
127- ' -Dmaven.test.skip=true clean deploy -U -B'
128- }
112+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
113+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
114+ ' -Dartifactory.server=https://repo.spring.io ' +
115+ " -Dartifactory.username=${ ARTIFACTORY_USR} " +
116+ " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
117+ " -Dartifactory.staging-repository=libs-snapshot-local " +
118+ " -Dartifactory.build-name=spring-data-jpa " +
119+ " -Dartifactory.build-number=${ BUILD_NUMBER} " +
120+ ' -Dmaven.test.skip=true clean deploy -U -B'
129121 }
130122 }
131123 }
0 commit comments