@@ -34,7 +34,7 @@ pipeline {
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 ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
40
40
}
@@ -51,7 +51,7 @@ pipeline {
51
51
}
52
52
}
53
53
parallel {
54
- stage(" test: baseline (next )" ) {
54
+ stage(" test: baseline (jdk11 )" ) {
55
55
agent {
56
56
label ' data'
57
57
}
@@ -61,8 +61,8 @@ pipeline {
61
61
}
62
62
steps {
63
63
script {
64
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
65
- docker. image(p[' docker.java.next .image' ]). inside(p[' docker.java.inside.basic' ]) {
64
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
65
+ docker. image(p[' docker.java.11 .image' ]). inside(p[' docker.java.inside.basic' ]) {
66
66
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
67
67
}
68
68
}
@@ -80,7 +80,7 @@ pipeline {
80
80
}
81
81
steps {
82
82
script {
83
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
83
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
84
84
docker. image(p[' docker.java.15.image' ]). inside(p[' docker.java.inside.basic' ]) {
85
85
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
86
86
}
@@ -109,7 +109,7 @@ pipeline {
109
109
110
110
steps {
111
111
script {
112
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
112
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
113
113
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
114
114
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
115
115
' -Dartifactory.server=https://repo.spring.io ' +
@@ -139,7 +139,7 @@ pipeline {
139
139
140
140
steps {
141
141
script {
142
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
142
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
143
143
docker. image(' adoptopenjdk/openjdk8:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
144
144
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
145
145
' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments