@@ -36,12 +36,10 @@ pipeline {
36
36
}
37
37
steps {
38
38
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"
45
43
}
46
44
}
47
45
}
@@ -66,17 +64,15 @@ pipeline {
66
64
67
65
steps {
68
66
script {
69
- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
70
- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
71
- sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
72
- ' -Dartifactory.server=https://repo.spring.io ' +
73
- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
74
- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
75
- " -Dartifactory.staging-repository=libs-snapshot-local " +
76
- " -Dartifactory.build-name=spring-data-jpa " +
77
- " -Dartifactory.build-number=${ BUILD_NUMBER} " +
78
- ' -Dmaven.test.skip=true clean deploy -U -B'
79
- }
67
+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
68
+ sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
69
+ ' -Dartifactory.server=https://repo.spring.io ' +
70
+ " -Dartifactory.username=${ ARTIFACTORY_USR} " +
71
+ " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
72
+ " -Dartifactory.staging-repository=libs-snapshot-local " +
73
+ " -Dartifactory.build-name=spring-data-jpa " +
74
+ " -Dartifactory.build-number=${ BUILD_NUMBER} " +
75
+ ' -Dmaven.test.skip=true clean deploy -U -B'
80
76
}
81
77
}
82
78
}
0 commit comments