You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/09/22 18:18:18 UTC
[maven] 01/01: try to fix node build
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch reproducible
in repository https://gitbox.apache.org/repos/asf/maven.git
commit b7ca305a7ddb8e3ea9e238421fc59dbc961eead9
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Sep 22 14:01:43 2019 +0200
try to fix node build
---
Jenkinsfile | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6e54ae8..d3cc099 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,7 +66,7 @@ node(jenkinsEnv.nodeSelection(osNode)) {
}
}
- tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
+ tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
}
}
@@ -78,13 +78,24 @@ for (String os in runITsOses) {
String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}")
echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}"
+ def cmd = [
+ 'mvn',
+ 'verify',
+ '-DskipTests', '-Drat.skip'
+ ]
+ if (jdk == '7') {
+ // Java 7u80 has TLS 1.2 disabled by default: need to explicitely enable
+ cmd += '-Dhttps.protocols=TLSv1.2'
+ }
+
String stageId = "${os}-jdk${jdk}"
String stageLabel = "Rebuild ${os.capitalize()} Java ${jdk}"
runITsTasks[stageId] = {
node(jenkinsEnv.nodeSelection(osLabel)) {
+ def WORK_DIR=pwd()
stage("${stageLabel}") {
echo "NODE_NAME = ${env.NODE_NAME}"
- checkout scm
+ checkout tests
withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/.repository", options:[
artifactsPublisher(disabled: false),
junitPublisher(ignoreAttachments: false),
@@ -94,7 +105,11 @@ for (String os in runITsOses) {
invokerPublisher(),
pipelineGraphPublisher()
]) {
- sh "mvn clean ${MAVEN_GOAL} -B -U -e -fae -V -DskipTests"
+ if (isUnix()) {
+ sh cmd.join(' ')
+ } else {
+ bat cmd.join(' ')
+ }
}
}
}