diff --git a/Jenkinsfile b/Jenkinsfile index 0d39d688..f9b551a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,33 +16,14 @@ try { node { checkout scm try { - sh "./gradlew clean check --refresh-dependencies --no-daemon" + sh './gradlew clean check --no-daemon --refresh-dependencies' } - catch (Exception cause) { + catch (e) { currentBuild.result = 'FAILED: check' - throw cause + throw e } finally { - junit '**/build/test-results/test/*.xml' - } - } - } - } - }, - springio: { - stage('Spring IO') { - timeout(time: 10, unit: 'MINUTES') { - node { - checkout scm - try { - sh "./gradlew clean springIoCheck -PplatformVersion=Cairo-SR2 -PexcludeProjects='**/samples/**' --stacktrace --refresh-dependencies --no-daemon" - } - catch (Exception cause) { - currentBuild.result = 'FAILED: springio' - throw cause - } - finally { - junit '**/build/spring-io*-results/*.xml' + junit '**/build/test-results/*/*.xml' } } }