Skip to content
This repository was archived by the owner on Mar 11, 2022. It is now read-only.

Commit 8e2d188

Browse files
authored
Merge pull request #334 from cloudant/lint+test-improvements
Lint+test improvements
2 parents 33ecce6 + c77ba56 commit 8e2d188

File tree

5 files changed

+703
-933
lines changed

5 files changed

+703
-933
lines changed

Jenkinsfile

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def setupNodeAndTest(version, testSuite='test') {
5353
nvm install ${version}
5454
nvm use ${version}
5555
npm install mocha-jenkins-reporter --save-dev
56-
./node_modules/mocha/bin/mocha --timeout $MOCHA_TIMEOUT --reporter mocha-jenkins-reporter --reporter-options junit_report_path=./${testSuite}/test-results.xml,junit_report_stack=true,junit_report_name=${testSuite} ${testSuite}
56+
./node_modules/mocha/bin/mocha --timeout $MOCHA_TIMEOUT --reporter mocha-jenkins-reporter --reporter-options junit_report_path=./${testSuite}/test-results.xml,junit_report_stack=true,junit_report_name=${testSuite} ${testSuite} --grep 'Virtual Hosts' --invert
5757
"""
5858
} finally {
5959
junit '**/test-results.xml'
@@ -72,16 +72,21 @@ stage('Build') {
7272
}
7373
}
7474

75-
stage('QA: Node6x') {
76-
setupNodeAndTest('lts/boron') // 6.x LTS
77-
}
78-
79-
stage('QA: Node8x') {
80-
setupNodeAndTest('lts/carbon') //8.x LTS
81-
}
82-
83-
stage('QA: Node') {
84-
setupNodeAndTest('node') // Current
75+
stage('QA') {
76+
parallel([
77+
Node6x : {
78+
// 6.x LTS
79+
setupNodeAndTest('lts/boron')
80+
},
81+
Node8x : {
82+
//8.x LTS
83+
setupNodeAndTest('lts/carbon')
84+
},
85+
Node : {
86+
// Current
87+
setupNodeAndTest('node')
88+
},
89+
])
8590
}
8691

8792
// Publish the master branch

0 commit comments

Comments
 (0)