@@ -32,13 +32,13 @@ pipeline {
32
32
options { timeout(time : 30 , unit : ' MINUTES' ) }
33
33
34
34
environment {
35
- DOCKER_HUB = credentials(' hub. docker.com-springbuildmaster ' )
36
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
35
+ DOCKER_HUB = credentials(" ${ p[' docker.credentials'] } " )
36
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
37
37
}
38
38
39
39
steps {
40
40
script {
41
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
41
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
42
42
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
43
43
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
44
44
sh " PROFILE=none ci/test.sh"
@@ -63,12 +63,12 @@ pipeline {
63
63
options { timeout(time : 20 , unit : ' MINUTES' ) }
64
64
65
65
environment {
66
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
66
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
67
67
}
68
68
69
69
steps {
70
70
script {
71
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
71
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
72
72
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
73
73
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-neo4j-non-root ' +
74
74
' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments