Skip to content

Commit 8e3527a

Browse files
ZOOKEEPER-5066: Update JDK11 to JDK 17, 25 in s390x jenkinsfile
Reviewers: PDavid, anmolnar Author: shreya-sawant Closes #2420 from shreya-sawant/s390x-jenkins-fix
1 parent 0cb298e commit 8e3527a

1 file changed

Lines changed: 34 additions & 27 deletions

File tree

Jenkinsfile-s390x

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,42 @@ pipeline {
3434

3535
stages {
3636
stage('Prepare') {
37-
38-
agent {
39-
label 's390x'
40-
}
41-
42-
tools {
43-
maven "maven_latest"
44-
jdk "jdk_11_latest"
45-
}
46-
47-
stages {
48-
stage('BuildAndTest') {
49-
steps {
50-
sh "git clean -fxd"
51-
sh "mvn verify spotbugs:check checkstyle:check -Pfull-build -Dsurefire-forkcount=4"
37+
matrix {
38+
agent {
39+
label 's390x'
40+
}
41+
axes {
42+
axis {
43+
name 'JAVA_VERSION'
44+
values 'jdk_17_latest', 'jdk_25_latest'
5245
}
53-
post {
54-
always {
55-
junit '**/target/surefire-reports/TEST-*.xml'
56-
archiveArtifacts '**/target/*.jar'
46+
}
47+
48+
tools {
49+
maven "maven_latest"
50+
jdk "${JAVA_VERSION}"
51+
}
52+
53+
stages {
54+
stage('BuildAndTest') {
55+
steps {
56+
sh "git clean -fxd"
57+
sh "mvn verify spotbugs:check checkstyle:check -Pfull-build -Dsurefire-forkcount=4"
5758
}
58-
// Jenkins pipeline jobs fill slaves on PRs without this :(
59-
cleanup() {
60-
script {
61-
sh label: 'Cleanup workspace', script: '''
62-
# See HADOOP-13951
63-
chmod -R u+rxw "${WORKSPACE}"
64-
'''
65-
deleteDir()
59+
post {
60+
always {
61+
junit '**/target/surefire-reports/TEST-*.xml'
62+
archiveArtifacts '**/target/*.jar'
63+
}
64+
// Jenkins pipeline jobs fill slaves on PRs without this :(
65+
cleanup() {
66+
script {
67+
sh label: 'Cleanup workspace', script: '''
68+
# See HADOOP-13951
69+
chmod -R u+rxw "${WORKSPACE}"
70+
'''
71+
deleteDir()
72+
}
6673
}
6774
}
6875
}

0 commit comments

Comments
 (0)