Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Mick Semb Wever 2020-03-28 11:50:02 +01:00
commit aec4c31fcc
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
1 changed files with 6 additions and 4 deletions

10
.jenkins/Jenkinsfile vendored
View File

@ -20,9 +20,11 @@
// Jenkins infrastructure related settings should be kept in
// https://github.com/apache/cassandra-builds/blob/master/jenkins-dsl/cassandra_job_dsl_seed.groovy
//
// Validate/lint this file using the following command
// `curl -X POST -F "jenkinsfile=<.jenkins/Jenkinsfile" https://builds.apache.org/pipeline-model-converter/validate`
pipeline {
agent any
agent { label 'cassandra' }
stages {
stage('Init') {
steps {
@ -85,21 +87,21 @@ pipeline {
stage('JVM DTests') {
steps {
warnError('Tests unstable') {
build job: "${env.JOB_NAME}-test-jvm-dtest-forking"
build job: "${env.JOB_NAME}-jvm-dtest"
}
}
post {
success {
warnError('missing test xml files') {
script {
copyTestResults('test-jvm-dtest-forking')
copyTestResults('jvm-dtest')
}
}
}
unstable {
warnError('missing test xml files') {
script {
copyTestResults('test-jvm-dtest-forking')
copyTestResults('jvm-dtest')
}
}
}