Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve build on s390 (#1313) 

* Use JDK 11 as default for s390 builds
* Checkout the same branch name for ITs as for build
This commit is contained in:
Slawomir Jaranowski 2023-11-19 16:46:24 +01:00 committed by GitHub
parent 9d65e2b240
commit 1a61b80dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Jenkinsfile.s390x
View File

@ -42,7 +42,6 @@ node('s390x') {
stage('Build / Unit Test') { stage('Build / Unit Test') {
String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk) String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
jdkName = "ibm-semeru-8u362-b09"
String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn) String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
try { try {
withEnv(["JAVA_HOME=${ tool "$jdkName" }", withEnv(["JAVA_HOME=${ tool "$jdkName" }",
@ -79,10 +78,20 @@ for (String os in runITsOses) {
// will not trample each other plus workaround for JENKINS-52657 // will not trample each other plus workaround for JENKINS-52657
dir(isUnix() ? 'test' : "c:\\mvn-it-${EXECUTOR_NUMBER}.tmp") { dir(isUnix() ? 'test' : "c:\\mvn-it-${EXECUTOR_NUMBER}.tmp") {
def WORK_DIR=pwd() def WORK_DIR=pwd()
def ITS_BRANCH = env.CHANGE_BRANCH != null ? env.CHANGE_BRANCH : env.BRANCH_NAME;
try {
echo "Checkout ITs from branch: ${ITS_BRANCH}"
checkout([$class: 'GitSCM',
branches: [[name: ITS_BRANCH]],
extensions: [[$class: 'CloneOption', depth: 1, noTags: true, shallow: true]],
userRemoteConfigs: [[url: 'https://github.com/apache/maven-integration-testing.git']]])
} catch (Throwable e) {
echo "Failure checkout ITs branch: ${ITS_BRANCH} - fallback master branch"
checkout([$class: 'GitSCM', checkout([$class: 'GitSCM',
branches: [[name: "*/master"]], branches: [[name: "*/master"]],
extensions: [[$class: 'CloneOption', depth: 1, noTags: true, shallow: true]], extensions: [[$class: 'CloneOption', depth: 1, noTags: true, shallow: true]],
userRemoteConfigs: [[url: 'https://github.com/apache/maven-integration-testing.git']]]) userRemoteConfigs: [[url: 'https://github.com/apache/maven-integration-testing.git']]])
}
if (isUnix()) { if (isUnix()) {
sh "rm -rvf $WORK_DIR/dists $WORK_DIR/it-local-repo" sh "rm -rvf $WORK_DIR/dists $WORK_DIR/it-local-repo"
} else { } else {