Skip to content

Commit 9d70c0f

Browse files
committed
remove parallel nodes
1 parent 25ef205 commit 9d70c0f

File tree

1 file changed

+13
-22
lines changed

1 file changed

+13
-22
lines changed

Jenkinsfile

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,30 @@
1-
node("cxs-ups-testsuites") {
1+
node("cxs-ups-testsuites_large") {
22
echo sh(returnStdout: true, script: 'env')
33

4-
// Mark the code checkout 'stage'....
54
stage ('Checkout') {
65
checkout scm
76
}
87

9-
// Mark the code build 'stage'....
108
stage ("Build") {
119
// Run the maven build with in-module unit testing
1210
sh "mvn -f restcomm/pom.xml -T 1.5C clean install -pl \\!restcomm.testsuite -Dmaven.test.failure.ignore=true -Dmaven.test.redirectTestOutputToFile=true"
1311
//keep this build for later use
14-
//TODO stash allowEmpty: true, includes: '$HOME/.m2/repository/org/restcomm/**', name: 'mavenArtifacts'
1512
junit '**/target/surefire-reports/*.xml'
1613
//prevent to report this test results two times
1714
sh "mvn -f restcomm/pom.xml clean"
1815
}
1916

20-
stage("CITestsuite") {
21-
parallel (
22-
"SequentialTests" : {
23-
//this runs in same node as previous, no need to recompile
24-
sh 'mvn -f restcomm/restcomm.testsuite/pom.xml clean install -DskipUTs=false -Dmaven.test.failure.ignore=true -Dmaven.test.redirectTestOutputToFile=true -Dfailsafe.rerunFailingTestsCount=0 -DexcludedGroups="org.restcomm.connect.commons.annotations.ParallelClassTests or org.restcomm.connect.commons.annotations.UnstableTests or org.restcomm.connect.commons.annotations.BrokenTests"'
25-
junit testResults: '**/target/surefire-reports/*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']]
26-
},
27-
"ParallelTests" : {
28-
node('cxs-ups-testsuites_large'){
29-
//different node, rebuild
30-
//TODO unstash 'mavenArtifacts'
31-
checkout scm
32-
sh 'mvn -f restcomm/pom.xml -T 1.5C clean install -pl \\!restcomm.testsuite -DskipTests'
33-
sh 'mvn -f restcomm/restcomm.testsuite/pom.xml clean install -Pparallel-testing -DforkCount=16 -Dmaven.test.failure.ignore=true -Dmaven.test.redirectTestOutputToFile=true -Dfailsafe.rerunFailingTestsCount=0 -Dgroups="org.restcomm.connect.commons.annotations.ParallelClassTests" -DexcludedGroups="org.restcomm.connect.commons.annotations.UnstableTests or org.restcomm.connect.commons.annotations.BrokenTests"'
34-
junit testResults: '**/target/surefire-reports/*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']]
35-
}
36-
}
37-
)
17+
stage("CITestsuiteSeq") {
18+
sh 'mvn -f restcomm/restcomm.testsuite/pom.xml clean install -DskipUTs=false -Dmaven.test.failure.ignore=true -Dmaven.test.redirectTestOutputToFile=true -Dfailsafe.rerunFailingTestsCount=0 -DexcludedGroups="org.restcomm.connect.commons.annotations.ParallelClassTests or org.restcomm.connect.commons.annotations.UnstableTests or org.restcomm.connect.commons.annotations.BrokenTests"'
19+
junit testResults: '**/target/surefire-reports/*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']]
20+
//prevent to report this test results two times
21+
sh "mvn -f restcomm/pom.xml clean"
22+
}
23+
24+
stage("CITestsuiteParallel") {
25+
sh 'mvn -f restcomm/restcomm.testsuite/pom.xml clean install -Pparallel-testing -DforkCount=16 -Dmaven.test.failure.ignore=true -Dmaven.test.redirectTestOutputToFile=true -Dfailsafe.rerunFailingTestsCount=0 -Dgroups="org.restcomm.connect.commons.annotations.ParallelClassTests" -DexcludedGroups="org.restcomm.connect.commons.annotations.UnstableTests or org.restcomm.connect.commons.annotations.BrokenTests"'
26+
junit testResults: '**/target/surefire-reports/*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']]
27+
//prevent to report this test results two times
28+
sh "mvn -f restcomm/pom.xml clean"
3829
}
3930
}

0 commit comments

Comments
 (0)