Skip to content

Commit 3b921b7

Browse files
committed
Revert build jdk11 and jdk16 sequentially
1 parent fa6f636 commit 3b921b7

File tree

1 file changed

+35
-33
lines changed

1 file changed

+35
-33
lines changed

Jenkinsfile

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -49,48 +49,50 @@ pipeline {
4949
not { triggeredBy 'UpstreamCause' }
5050
}
5151
}
52-
stage("test: baseline (jdk11)") {
53-
agent {
54-
label 'data'
55-
}
56-
options { timeout(time: 30, unit: 'MINUTES') }
52+
parallel {
53+
stage("test: baseline (jdk11)") {
54+
agent {
55+
label 'data'
56+
}
57+
options { timeout(time: 30, unit: 'MINUTES') }
5758

58-
environment {
59-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
60-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
61-
}
59+
environment {
60+
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
61+
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
62+
}
6263

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"
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+
}
7072
}
7173
}
7274
}
7375
}
74-
}
7576

76-
stage("test: baseline (jdk16)") {
77-
agent {
78-
label 'data'
79-
}
80-
options { timeout(time: 30, unit: 'MINUTES') }
77+
stage("test: baseline (jdk16)") {
78+
agent {
79+
label 'data'
80+
}
81+
options { timeout(time: 30, unit: 'MINUTES') }
8182

82-
environment {
83-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
84-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
85-
}
83+
environment {
84+
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
85+
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
86+
}
8687

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"
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+
}
9496
}
9597
}
9698
}

0 commit comments

Comments
 (0)