Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 23256fd

Browse files
author
Chad Dougherty
committed
comment out xUnit test collection method for the time being
it was probably wrong for Jenkins master and it is DEFINITELY wrong for remote Jenkins worker VMs...
1 parent 1be2304 commit 23256fd

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Jenkinsfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pipeline {
99
agent {
1010
docker {
1111
image 'ubuntu:xenial'
12-
args '-v ${WORKSPACE}/../builds/${BUILD_ID}:/job:rw'
12+
// args '-v ${WORKSPACE}/../builds/${BUILD_ID}:/job:rw'
1313
}
1414
}
1515
steps {
@@ -18,7 +18,7 @@ pipeline {
1818
sh 'mkdir build'
1919
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
2020
sh 'cd build && make check -j4 || true'
21-
sh 'cd build && cp -pr test /job/' // special tests collection step just for this stage
21+
// sh 'cd build && cp -pr test /job/' // special tests collection step just for this stage
2222
sh 'cd build && make install'
2323
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
2424
sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
@@ -177,7 +177,7 @@ pipeline {
177177
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
178178
// sh 'python ./script/validators/source_validator.py'
179179
// sh 'mkdir build'
180-
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
180+
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
181181
// sh 'cd build && make check -j4 || true'
182182
// sh 'cd build && make install'
183183
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
@@ -296,11 +296,11 @@ pipeline {
296296
}
297297

298298
// Process test results from the first build stage
299-
post {
300-
always {
301-
dir("${WORKSPACE}/../builds/${BUILD_ID}") {
302-
step([$class: 'XUnitBuilder', testTimeMargin: '3000', thresholdMode: 1, thresholds: [[$class: 'FailedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: ''], [$class: 'SkippedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '']], tools: [[$class: 'GoogleTestType', deleteOutputFiles: true, failIfNotNew: true, pattern: 'test/*_test.xml', skipNoTestFiles: false, stopProcessingIfError: true]]])
303-
}
304-
}
305-
}
299+
// post {
300+
// always {
301+
// dir("${WORKSPACE}/../builds/${BUILD_ID}") {
302+
// step([$class: 'XUnitBuilder', testTimeMargin: '3000', thresholdMode: 1, thresholds: [[$class: 'FailedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: ''], [$class: 'SkippedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '']], tools: [[$class: 'GoogleTestType', deleteOutputFiles: true, failIfNotNew: true, pattern: 'test/*_test.xml', skipNoTestFiles: false, stopProcessingIfError: true]]])
303+
// }
304+
// }
305+
// }
306306
}

0 commit comments

Comments
 (0)