You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/10/17 21:06:35 UTC
[maven] branch maven-3.9.x updated: Use the same branch name for ITs on Jenkins (#1263)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 53edd71c98 Use the same branch name for ITs on Jenkins (#1263)
53edd71c98 is described below
commit 53edd71c989d8f2f2b92ee0b281976772c78b927
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu Oct 5 03:44:01 2023 +0200
Use the same branch name for ITs on Jenkins (#1263)
(cherry picked from commit 882c8dd9746f2fb7bec1c2b7b6ece4b85c75f701)
---
Jenkinsfile | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 77c6d7c3aa..3fd3a0a5dd 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 maven-3.9.x branch"
+ checkout([$class: 'GitSCM',
+ branches: [[name: "maven-3.9.x"]],
+ 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/apache-maven-dist.zip $WORK_DIR/it-local-repo"
} else {