@@ -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/test.sh"
@@ -63,13 +63,13 @@ pipeline {
63
63
options { timeout(time : 30 , unit : ' MINUTES' ) }
64
64
65
65
environment {
66
- DOCKER_HUB = credentials(' hub. docker.com-springbuildmaster ' )
67
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
66
+ DOCKER_HUB = credentials(" ${ p[' docker.credentials'] } " )
67
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
68
68
}
69
69
70
70
steps {
71
71
script {
72
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
72
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
73
73
docker. image(p[' docker.java.11.image' ]). inside(p[' docker.java.inside.docker' ]) {
74
74
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
75
75
sh " PROFILE=java11 ci/test.sh"
@@ -87,13 +87,13 @@ pipeline {
87
87
options { timeout(time : 30 , unit : ' MINUTES' ) }
88
88
89
89
environment {
90
- DOCKER_HUB = credentials(' hub. docker.com-springbuildmaster ' )
91
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
90
+ DOCKER_HUB = credentials(" ${ p[' docker.credentials'] } " )
91
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
92
92
}
93
93
94
94
steps {
95
95
script {
96
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
96
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
97
97
docker. image(p[' docker.java.15.image' ]). inside(p[' docker.java.inside.docker' ]) {
98
98
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
99
99
sh " PROFILE=java11 ci/test.sh"
@@ -119,12 +119,12 @@ pipeline {
119
119
options { timeout(time : 20 , unit : ' MINUTES' ) }
120
120
121
121
environment {
122
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
122
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
123
123
}
124
124
125
125
steps {
126
126
script {
127
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
127
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
128
128
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
129
129
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 ' +
130
130
' -Dartifactory.server=https://repo.spring.io ' +
@@ -150,12 +150,12 @@ pipeline {
150
150
options { timeout(time : 20 , unit : ' MINUTES' ) }
151
151
152
152
environment {
153
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
153
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
154
154
}
155
155
156
156
steps {
157
157
script {
158
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
158
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
159
159
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
160
160
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-neo4j-non-root ' +
161
161
' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments