This is an automated email from the ASF dual-hosted git repository.
anmolnar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 8e3527a5a ZOOKEEPER-5066: Update JDK11 to JDK 17, 25 in s390x
jenkinsfile
8e3527a5a is described below
commit 8e3527a5a8e89edf1b51e3e12ed14fc29a16a203
Author: Shreya Sawant <[email protected]>
AuthorDate: Tue Jul 7 20:11:46 2026 +0530
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
---
Jenkinsfile-s390x | 61 +++++++++++++++++++++++++++++++------------------------
1 file changed, 34 insertions(+), 27 deletions(-)
diff --git a/Jenkinsfile-s390x b/Jenkinsfile-s390x
index bd48a1c28..a04e43e45 100644
--- a/Jenkinsfile-s390x
+++ b/Jenkinsfile-s390x
@@ -34,35 +34,42 @@ pipeline {
stages {
stage('Prepare') {
-
- agent {
- label 's390x'
- }
-
- tools {
- maven "maven_latest"
- jdk "jdk_11_latest"
- }
-
- stages {
- stage('BuildAndTest') {
- steps {
- sh "git clean -fxd"
- sh "mvn verify spotbugs:check checkstyle:check
-Pfull-build -Dsurefire-forkcount=4"
+ matrix {
+ agent {
+ label 's390x'
+ }
+ axes {
+ axis {
+ name 'JAVA_VERSION'
+ values 'jdk_17_latest', 'jdk_25_latest'
}
- post {
- always {
- junit '**/target/surefire-reports/TEST-*.xml'
- archiveArtifacts '**/target/*.jar'
+ }
+
+ tools {
+ maven "maven_latest"
+ jdk "${JAVA_VERSION}"
+ }
+
+ stages {
+ stage('BuildAndTest') {
+ steps {
+ sh "git clean -fxd"
+ sh "mvn verify spotbugs:check checkstyle:check
-Pfull-build -Dsurefire-forkcount=4"
}
- // Jenkins pipeline jobs fill slaves on PRs without
this :(
- cleanup() {
- script {
- sh label: 'Cleanup workspace', script: '''
- # See HADOOP-13951
- chmod -R u+rxw "${WORKSPACE}"
- '''
- deleteDir()
+ post {
+ always {
+ junit '**/target/surefire-reports/TEST-*.xml'
+ archiveArtifacts '**/target/*.jar'
+ }
+ // Jenkins pipeline jobs fill slaves on PRs
without this :(
+ cleanup() {
+ script {
+ sh label: 'Cleanup workspace', script: '''
+ # See HADOOP-13951
+ chmod -R u+rxw "${WORKSPACE}"
+ '''
+ deleteDir()
+ }
}
}
}