@@ -38,12 +38,10 @@ pipeline {
3838
3939 steps {
4040 script {
41- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
42- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
43- sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
44- sh " PROFILE=ci,all-dbs ci/test.sh"
45- sh " ci/clean.sh"
46- }
41+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
42+ sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
43+ sh " PROFILE=ci,all-dbs ci/test.sh"
44+ sh " ci/clean.sh"
4745 }
4846 }
4947 }
@@ -71,12 +69,10 @@ pipeline {
7169
7270 steps {
7371 script {
74- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
75- docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.docker' ]) {
76- sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
77- sh " PROFILE=ci ci/test.sh"
78- sh " ci/clean.sh"
79- }
72+ docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.docker' ]) {
73+ sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
74+ sh " PROFILE=ci ci/test.sh"
75+ sh " ci/clean.sh"
8076 }
8177 }
8278 }
@@ -95,12 +91,10 @@ pipeline {
9591
9692 steps {
9793 script {
98- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
99- docker. image(p[' docker.java.lts.image' ]). inside(p[' docker.java.inside.docker' ]) {
100- sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
101- sh " PROFILE=ci ci/test.sh"
102- sh " ci/clean.sh"
103- }
94+ docker. image(p[' docker.java.lts.image' ]). inside(p[' docker.java.inside.docker' ]) {
95+ sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
96+ sh " PROFILE=ci ci/test.sh"
97+ sh " ci/clean.sh"
10498 }
10599 }
106100 }
@@ -127,17 +121,15 @@ pipeline {
127121
128122 steps {
129123 script {
130- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
131- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
132- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
133- ' -Dartifactory.server=https://repo.spring.io ' +
134- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
135- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
136- " -Dartifactory.staging-repository=libs-snapshot-local " +
137- " -Dartifactory.build-name=spring-data-jdbc " +
138- " -Dartifactory.build-number=${ BUILD_NUMBER} " +
139- ' -Dmaven.test.skip=true clean deploy -U -B'
140- }
124+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
125+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-jdbc-non-root ' +
126+ ' -Dartifactory.server=https://repo.spring.io ' +
127+ " -Dartifactory.username=${ ARTIFACTORY_USR} " +
128+ " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
129+ " -Dartifactory.staging-repository=libs-snapshot-local " +
130+ " -Dartifactory.build-name=spring-data-jdbc " +
131+ " -Dartifactory.build-number=${ BUILD_NUMBER} " +
132+ ' -Dmaven.test.skip=true clean deploy -U -B'
141133 }
142134 }
143135 }
0 commit comments