iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3302 from dassiorleando/master 

BAEL-720: better handle failed test in Jenkins pipeline
This commit is contained in:
Loredana Crusoveanu 2017-12-27 19:47:33 +02:00 committed by GitHub
parent e9c7fefc21 3219228071
commit 13b9b3d9e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-jenkins-pipeline/scripted-pipeline-unix-nonunix
View File

@ -31,25 +31,36 @@ node {
stage("Tests and Deployment") { stage("Tests and Deployment") {
parallel 'Unit tests': { parallel 'Unit tests': {
stage("Runing unit tests") { stage("Running unit tests") {
try {
if (isUnix()) { if (isUnix()) {
sh "./mvnw test -Punit" sh "./mvnw test -Punit"
} else { } else {
bat "./mvnw.cmd test -Punit" bat "./mvnw.cmd test -Punit"
} }
} catch(err) {
step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*UnitTest.xml'])
throw err
}
step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*UnitTest.xml']) step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*UnitTest.xml'])
} }
}, 'Integration tests': { }, 'Integration tests': {
stage("Runing integration tests") { stage("Running integration tests") {
try {
if (isUnix()) { if (isUnix()) {
sh "./mvnw test -Pintegration" sh "./mvnw test -Pintegration"
} else { } else {
bat "./mvnw.cmd test -Pintegration" bat "./mvnw.cmd test -Pintegration"
} }
} catch(err) {
step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*IntegrationTest.xml'])
throw err
}
step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*IntegrationTest.xml']) step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*IntegrationTest.xml'])
} }
}, 'Deployment': { }
stage("Staging") { stage("Staging") {
if (isUnix()) { if (isUnix()) {
sh "pid=\$(lsof -i:8989 -t); kill -TERM \$pid || kill -KILL \$pid" sh "pid=\$(lsof -i:8989 -t); kill -TERM \$pid || kill -KILL \$pid"
@ -67,5 +78,4 @@ node {
} }
} }
} }
}
} }

2
spring-jenkins-pipeline/src/test/java/com/baeldung/SomeUnitTest.java
View File

@ -6,6 +6,6 @@ import static org.junit.Assert.*;
public class SomeUnitTest { public class SomeUnitTest {
@Test @Test
public void init() { public void init() {
assertEquals(1, 0); assertEquals(1, 1);
} }
} }