This is an automated email from the ASF dual-hosted git repository.
olamy 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 882c8dd974 Use the same branch name for ITs on Jenkins (#1263)
882c8dd974 is described below
commit 882c8dd9746f2fb7bec1c2b7b6ece4b85c75f701
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Thu Oct 5 03:44:01 2023 +0200
Use the same branch name for ITs on Jenkins (#1263)
* Use the same branch name for ITs on Jenkins
* Try CHANGE_BRANCH env on PR
* CHANGE_BRANCH can be null
---
Jenkinsfile | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a2ecf0f1d4..33fc905c32 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -84,10 +84,21 @@ 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 {
