@@ -49,50 +49,48 @@ pipeline {
4949 not { triggeredBy ' UpstreamCause' }
5050 }
5151 }
52- parallel {
53- stage(" test: baseline (jdk11)" ) {
54- agent {
55- label ' data'
56- }
57- options { timeout(time : 30 , unit : ' MINUTES' ) }
52+ stage(" test: baseline (jdk11)" ) {
53+ agent {
54+ label ' data'
55+ }
56+ options { timeout(time : 30 , unit : ' MINUTES' ) }
5857
59- environment {
60- DOCKER_HUB = credentials(' hub.docker.com-springbuildmaster' )
61- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
62- }
58+ environment {
59+ DOCKER_HUB = credentials(' hub.docker.com-springbuildmaster' )
60+ ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
61+ }
6362
64- steps {
65- script {
66- docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
67- docker. image(' adoptopenjdk/openjdk11:latest' ). inside(' -u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home' ) {
68- sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
69- sh ' PROFILE=java11 ci/verify.sh'
70- sh " ci/clean.sh"
71- }
63+ steps {
64+ script {
65+ docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
66+ docker. image(' adoptopenjdk/openjdk11:latest' ). inside(' -u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home' ) {
67+ sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
68+ sh ' PROFILE=java11 ci/verify.sh'
69+ sh " ci/clean.sh"
7270 }
7371 }
7472 }
7573 }
74+ }
7675
77- stage(" test: baseline (jdk16)" ) {
78- agent {
79- label ' data'
80- }
81- options { timeout(time : 30 , unit : ' MINUTES' ) }
76+ stage(" test: baseline (jdk16)" ) {
77+ agent {
78+ label ' data'
79+ }
80+ options { timeout(time : 30 , unit : ' MINUTES' ) }
8281
83- environment {
84- DOCKER_HUB = credentials(' hub.docker.com-springbuildmaster' )
85- ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
86- }
82+ environment {
83+ DOCKER_HUB = credentials(' hub.docker.com-springbuildmaster' )
84+ ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
85+ }
8786
88- steps {
89- script {
90- docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
91- docker. image(' adoptopenjdk/openjdk16:latest' ). inside(' -u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home' ) {
92- sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
93- sh ' PROFILE=java11 ci/verify.sh'
94- sh " ci/clean.sh"
95- }
87+ steps {
88+ script {
89+ docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
90+ docker. image(' adoptopenjdk/openjdk16:latest' ). inside(' -u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home' ) {
91+ sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
92+ sh ' PROFILE=java11 ci/verify.sh'
93+ sh " ci/clean.sh"
9694 }
9795 }
9896 }
0 commit comments