You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/02/13 15:46:42 UTC
[camel] branch master updated: Revert "Upgrade Jenkinsfile for JDK8
to use JAVA_HOME for openjdk"
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 991f8b8 Revert "Upgrade Jenkinsfile for JDK8 to use JAVA_HOME for openjdk"
991f8b8 is described below
commit 991f8b8ba73963a3914a67a80a222408e14caa9c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Feb 13 16:46:16 2021 +0100
Revert "Upgrade Jenkinsfile for JDK8 to use JAVA_HOME for openjdk"
This reverts commit d3903fb6736ae77b396528389e911a969dd78daf.
---
Jenkinsfile | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a83bbf6..641735f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,7 @@
*/
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+def JDK_NAME = env.JDK_NAME ?: 'jdk_1.8_latest'
def MAVEN_PARAMS = "-U -B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"
@@ -27,6 +28,10 @@ pipeline {
label AGENT_LABEL
}
+ tools {
+ jdk JDK_NAME
+ }
+
environment {
MAVEN_SKIP_RC = true
}
@@ -54,9 +59,6 @@ pipeline {
}
stage('Build & Deploy') {
- environment {
- JAVA_HOME = "/home/jenkins/tools/java/adoptopenjdk-hotspot-8u282-b08"
- }
when {
branch 'master'
}
@@ -66,9 +68,6 @@ pipeline {
}
stage('Website update') {
- environment {
- JAVA_HOME = "/home/jenkins/tools/java/adoptopenjdk-hotspot-8u282-b08"
- }
when {
branch 'master'
changeset 'docs/**/*'
@@ -80,9 +79,6 @@ pipeline {
}
stage('Checks') {
- environment {
- JAVA_HOME = "/home/jenkins/tools/java/adoptopenjdk-hotspot-8u282-b08"
- }
steps {
sh "./mvnw $MAVEN_PARAMS -pl :camel-buildtools install"
sh "./mvnw $MAVEN_PARAMS -Psourcecheck -Dcheckstyle.failOnViolation=false checkstyle:check"
@@ -90,9 +86,6 @@ pipeline {
}
stage('Test') {
- environment {
- JAVA_HOME = "/home/jenkins/tools/java/adoptopenjdk-hotspot-8u282-b08"
- }
steps {
sh "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true clean install"
}