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
apache · Oct 5, 2023 · 882c8dd · 882c8dd
1 parent 14d1606
commit 882c8dd
Showing 1 changed file with 15 additions and 4 deletions.
diff --git 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 {