@@ -31,13 +31,13 @@ pipeline {
31
31
options { timeout(time : 30 , unit : ' MINUTES' ) }
32
32
33
33
environment {
34
- DOCKER_HUB = credentials(' hub. docker.com-springbuildmaster ' )
35
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
34
+ DOCKER_HUB = credentials(" ${ p[' docker.credentials'] } " )
35
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
36
36
}
37
37
38
38
steps {
39
39
script {
40
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
40
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
41
41
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
42
42
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
43
43
sh ' PROFILE=none ci/verify.sh'
@@ -61,12 +61,12 @@ pipeline {
61
61
options { timeout(time : 20 , unit : ' MINUTES' ) }
62
62
63
63
environment {
64
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
64
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
65
65
}
66
66
67
67
steps {
68
68
script {
69
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
69
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
70
70
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
71
71
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-elasticsearch-non-root ' +
72
72
' -Dartifactory.server=https://repo.spring.io ' +
@@ -91,12 +91,12 @@ pipeline {
91
91
options { timeout(time : 20 , unit : ' MINUTES' ) }
92
92
93
93
environment {
94
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
94
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
95
95
}
96
96
97
97
steps {
98
98
script {
99
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
99
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
100
100
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
101
101
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
102
102
' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments