[camel-spring-boot] branch master updated: Jenkinsfile for JDK8: We should do only one build and run the test in the same step

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel-spring-boot] branch master updated: Jenkinsfile for JDK8: We should do only one build and run the test in the same step

acosentino
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-spring-boot.git


The following commit(s) were added to refs/heads/master by this push:
     new deaa468  Jenkinsfile for JDK8: We should do only one build and run the test in the same step
deaa468 is described below

commit deaa4682c03b236eba8dec10cb520066999cf3d2
Author: Andrea Cosentino <[hidden email]>
AuthorDate: Fri Feb 14 09:08:27 2020 +0100

    Jenkinsfile for JDK8: We should do only one build and run the test in the same step
---
 Jenkinsfile.sb | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile.sb b/Jenkinsfile.sb
index e5fc1a1..d1985e6 100644
--- a/Jenkinsfile.sb
+++ b/Jenkinsfile.sb
@@ -21,7 +21,7 @@ def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/mave
 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 -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2'
+def MAVEN_PARAMS = '-U -B -e -fae -V -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true'
 
 def spring_boot_itests_result
 
@@ -54,16 +54,8 @@ pipeline {
 
         stage('Build') {
             steps {
-                sh "./mvnw $MAVEN_PARAMS clean install"
-            }
-        }
-
-        stage('spring-boot-itests') {
-            steps {
-                dir("tests/camel-itest-spring-boot/") {
-                    script {
-                        spring_boot_itests_result = sh script: "../mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true clean install", returnStatus: true
-                    }
+                script {
+                    spring_boot_itests_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true clean install", returnStatus: true
                 }
             }
             post {
@@ -72,7 +64,6 @@ pipeline {
                 }
             }
         }
-
     }
 
     post {