This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch s390-jdk
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/s390-jdk by this push:
new 6608c1a076 Checkout the same branch name for ITs as for build
6608c1a076 is described below
commit 6608c1a076e9a5e530bf77f0ddc426d8e07aca87
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Sun Nov 19 11:40:03 2023 +0100
Checkout the same branch name for ITs as for build
---
Jenkinsfile.s390x | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index ab0515e1ed..e760a62539 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -78,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 {
