@@ -30,11 +30,11 @@ pipeline {
30
30
}
31
31
options { timeout(time : 30 , unit : ' MINUTES' ) }
32
32
environment {
33
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
33
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
34
34
}
35
35
steps {
36
36
script {
37
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
37
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
38
38
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
39
39
sh ' rm -Rf `find . -name "BACKUPDEFAULT*"`'
40
40
sh ' rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -63,11 +63,11 @@ pipeline {
63
63
}
64
64
options { timeout(time : 30 , unit : ' MINUTES' ) }
65
65
environment {
66
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
66
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
67
67
}
68
68
steps {
69
69
script {
70
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
70
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
71
71
docker. image(p[' docker.java.11.image' ]). inside(p[' docker.java.inside.basic' ]) {
72
72
sh ' rm -Rf `find . -name "BACKUPDEFAULT*"`'
73
73
sh ' rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -88,11 +88,11 @@ pipeline {
88
88
}
89
89
options { timeout(time : 30 , unit : ' MINUTES' ) }
90
90
environment {
91
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
91
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
92
92
}
93
93
steps {
94
94
script {
95
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
95
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
96
96
docker. image(p[' docker.java.15.image' ]). inside(p[' docker.java.inside.basic' ]) {
97
97
sh ' rm -Rf `find . -name "BACKUPDEFAULT*"`'
98
98
sh ' rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -122,12 +122,12 @@ pipeline {
122
122
options { timeout(time : 20 , unit : ' MINUTES' ) }
123
123
124
124
environment {
125
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
125
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
126
126
}
127
127
128
128
steps {
129
129
script {
130
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
130
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
131
131
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
132
132
sh ' rm -Rf `find . -name "BACKUPDEFAULT*"`'
133
133
sh ' rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -158,13 +158,13 @@ pipeline {
158
158
options { timeout(time : 20 , unit : ' MINUTES' ) }
159
159
160
160
environment {
161
- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c ' )
161
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials'] } " )
162
162
}
163
163
164
164
steps {
165
165
script {
166
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
167
- docker. image(' adoptopenjdk/openjdk8:latest ' ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
166
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
167
+ docker. image(p[ ' docker.java.main.image ' ] ). inside(p[ ' docker.java.inside.basic ' ] ) {
168
168
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
169
169
' -Dartifactory.server=https://repo.spring.io ' +
170
170
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
0 commit comments