This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 1a61b80dee Improve build on s390 (#1313)
1a61b80dee is described below
commit 1a61b80dee26266924eb46260ec861cf7bdab783
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Sun Nov 19 16:46:24 2023 +0100
Improve build on s390 (#1313)
* Use JDK 11 as default for s390 builds
* Checkout the same branch name for ITs as for build
---
Jenkinsfile.s390x | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index 818245998c..e760a62539 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -42,7 +42,6 @@ node('s390x') {
stage('Build / Unit Test') {
String jdkName = jenkinsEnv.jdkFromVersion(buildOs, buildJdk)
- jdkName = "ibm-semeru-8u362-b09"
String mvnName = jenkinsEnv.mvnFromVersion(buildOs, buildMvn)
try {
withEnv(["JAVA_HOME=${ tool "$jdkName" }",
@@ -79,10 +78,20 @@ for (String os in runITsOses) {
// will not trample each other plus workaround for
JENKINS-52657
dir(isUnix() ? 'test' :
"c:\\mvn-it-${EXECUTOR_NUMBER}.tmp") {
def WORK_DIR=pwd()
- checkout([$class: 'GitSCM',
- branches: [[name: "*/master"]],
- extensions: [[$class: 'CloneOption', depth: 1,
noTags: true, shallow: true]],
- userRemoteConfigs: [[url:
'https://github.com/apache/maven-integration-testing.git']]])
+ 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',
+ branches: [[name: "*/master"]],
+ extensions: [[$class: 'CloneOption', depth:
1, noTags: true, shallow: true]],
+ userRemoteConfigs: [[url:
'https://github.com/apache/maven-integration-testing.git']]])
+ }
if (isUnix()) {
sh "rm -rvf $WORK_DIR/dists
$WORK_DIR/it-local-repo"
} else {
