Merge pull request #244 from mboersma/unparallelize-lint-test

mboersma · web-flow · commit 2e261247882f · 2016-09-15T10:09:17.000-06:00
fix(Jenkinsfile): un-parallelize lint and test tasks
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -99,13 +99,10 @@ node(linux) {
 
 
 stage 'Lint and test container'
-parallel(
-	lint: {
+// TODO: re-parallelize these tasks when race condition is fixed.
 		node(linux) {
 			sh "docker run --rm ${test_image} lint"
 		}
-	},
-	test: {
 		node(linux) {
 			withCredentials([[$class: 'StringBinding',
 												credentialsId: '995d99a7-466b-4beb-bf75-f3ba91cbbc18',
@@ -122,8 +119,6 @@ parallel(
 				sh "docker run -e CODECOV_TOKEN=\${CODECOV_TOKEN} --rm ${test_image} sh -c 'test-cover.sh &&  ${codecov}'"
 			}
 		}
-	}
-)
 
 stage 'Build and Upload Artifacts'
 

Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,10 @@ node(linux) {`
`99`	`99`
`100`	`100`
`101`	`101`	`stage 'Lint and test container'`
`102`		`-parallel(`
`103`		`- lint: {`
	`102`	`+// TODO: re-parallelize these tasks when race condition is fixed.`
`104`	`103`	`node(linux) {`
`105`	`104`	`sh "docker run --rm ${test_image} lint"`
`106`	`105`	`}`
`107`		`- },`
`108`		`- test: {`
`109`	`106`	`node(linux) {`
`110`	`107`	`withCredentials([[$class: 'StringBinding',`
`111`	`108`	`credentialsId: '995d99a7-466b-4beb-bf75-f3ba91cbbc18',`
`@@ -122,8 +119,6 @@ parallel(`
`122`	`119`	`sh "docker run -e CODECOV_TOKEN=\${CODECOV_TOKEN} --rm ${test_image} sh -c 'test-cover.sh && ${codecov}'"`
`123`	`120`	`}`
`124`	`121`	`}`
`125`		`- }`
`126`		`-)`
`127`	`122`
`128`	`123`	`stage 'Build and Upload Artifacts'`
`129`	`124`