@@ -80,10 +80,8 @@ pipeline {
8080 }
8181 steps {
8282 script {
83- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
84- docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " ). inside(p[' docker.java.inside.basic' ]) {
85- sh ' PROFILE=none LONG_TESTS=true ci/test.sh'
86- }
83+ docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " ). inside(p[' docker.java.inside.basic' ]) {
84+ sh ' PROFILE=none LONG_TESTS=true ci/test.sh'
8785 }
8886 }
8987 }
@@ -108,10 +106,8 @@ pipeline {
108106 }
109107 steps {
110108 script {
111- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
112- docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${ p['java.lts.tag']} " ). inside(p[' docker.java.inside.basic' ]) {
113- sh ' PROFILE=none ci/test.sh'
114- }
109+ docker. image(" harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-redis-6.2:${ p['java.lts.tag']} " ). inside(p[' docker.java.inside.basic' ]) {
110+ sh ' PROFILE=none ci/test.sh'
115111 }
116112 }
117113 }
@@ -138,17 +134,15 @@ pipeline {
138134
139135 steps {
140136 script {
141- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
142- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
143- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
144- ' -Dartifactory.server=https://repo.spring.io ' +
145- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
146- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
147- " -Dartifactory.staging-repository=libs-snapshot-local " +
148- " -Dartifactory.build-name=spring-data-redis " +
149- " -Dartifactory.build-number=${ BUILD_NUMBER} " +
150- ' -Dmaven.test.skip=true clean deploy -U -B'
151- }
137+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
138+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
139+ ' -Dartifactory.server=https://repo.spring.io ' +
140+ " -Dartifactory.username=${ ARTIFACTORY_USR} " +
141+ " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
142+ " -Dartifactory.staging-repository=libs-snapshot-local " +
143+ " -Dartifactory.build-name=spring-data-redis " +
144+ " -Dartifactory.build-number=${ BUILD_NUMBER} " +
145+ ' -Dmaven.test.skip=true clean deploy -U -B'
152146 }
153147 }
154148 }
0 commit comments