Revert build jdk11 and jdk16 sequentially

This commit is contained in:
Peter-Josef Meisch 2021-07-18 14:03:42 +02:00
parent fa6f636906
commit 3b921b7454
No known key found for this signature in database
GPG Key ID: DE108246970C7708

68
Jenkinsfile vendored
View File

@ -49,48 +49,50 @@ pipeline {
not { triggeredBy 'UpstreamCause' } not { triggeredBy 'UpstreamCause' }
} }
} }
stage("test: baseline (jdk11)") { parallel {
agent { stage("test: baseline (jdk11)") {
label 'data' agent {
} label 'data'
options { timeout(time: 30, unit: 'MINUTES') } }
options { timeout(time: 30, unit: 'MINUTES') }
environment { environment {
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster') DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
} }
steps { steps {
script { script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
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') { 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') {
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
sh 'PROFILE=java11 ci/verify.sh' sh 'PROFILE=java11 ci/verify.sh'
sh "ci/clean.sh" sh "ci/clean.sh"
}
} }
} }
} }
} }
}
stage("test: baseline (jdk16)") { stage("test: baseline (jdk16)") {
agent { agent {
label 'data' label 'data'
} }
options { timeout(time: 30, unit: 'MINUTES') } options { timeout(time: 30, unit: 'MINUTES') }
environment { environment {
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster') DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c') ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
} }
steps { steps {
script { script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
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') { 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') {
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
sh 'PROFILE=java11 ci/verify.sh' sh 'PROFILE=java11 ci/verify.sh'
sh "ci/clean.sh" sh "ci/clean.sh"
}
} }
} }
} }