This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f5d5e72f61cffa16b591e4dfb527aac6c728e638
Merge: cf27558 9ee74c9
Author: Mick Semb Wever <[email protected]>
AuthorDate: Wed Sep 30 21:10:55 2020 +0200

    Merge branch 'cassandra-3.0' into cassandra-3.11

 .jenkins/Jenkinsfile | 19 ++++++++++++++++++-
 build.xml            | 21 +++++++++------------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --cc .jenkins/Jenkinsfile
index 404ce60,eceab9f..257ba1f
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -35,26 -35,9 +35,27 @@@ pipeline 
          steps {
              build job: "${env.JOB_NAME}-artifacts"
          }
 -      }
 -      stage('Test') {
 +    }
 +    stage('Test') {
          parallel {
 +          stage('stress') {
 +            steps {
 +                script {
 +                  stress = build job: "${env.JOB_NAME}-stress-test", 
propagate: false
 +                  if (stress.result != 'SUCCESS') unstable('stress test 
failures')
++                  if (stress.result == 'FAILURE') 
currentBuild.result='FAILURE'
 +                }
 +            }
 +            post {
 +              always {
 +                  warnError('missing test xml files') {
 +                      script {
 +                          copyTestResults('stress-test', stress.getNumber())
 +                      }
 +                  }
 +              }
 +            }
 +          }
            stage('jvm-dtest') {
              steps {
                script {
@@@ -140,23 -128,6 +146,24 @@@
                }
              }
            }
 +          stage('cdc') {
 +            steps {
 +              script {
 +                cdc = build job: "${env.JOB_NAME}-test-cdc", propagate: false
 +                if (cdc.result != 'SUCCESS') unstable('cdc failures')
++                if (cdc.result == 'FAILURE') currentBuild.result='FAILURE'
 +              }
 +            }
 +            post {
 +              always {
 +                  warnError('missing test xml files') {
 +                      script {
 +                          copyTestResults('test-cdc', cdc.getNumber())
 +                      }
 +                  }
 +              }
 +            }
 +          }
            stage('compression') {
              steps {
                script {
@@@ -179,21 -151,22 +187,22 @@@
                script {
                  cqlsh = build job: "${env.JOB_NAME}-cqlsh-tests", propagate: 
false
                    if (cqlsh.result != 'SUCCESS') unstable('cqlsh failures')
+                   if (cqlsh.result == 'FAILURE') currentBuild.result='FAILURE'
                  }
 -              }
 -              post {
 -                always {
 -                    warnError('missing test xml files') {
 -                        script {
 -                            copyTestResults('cqlsh-test', cqlsh.getNumber())
 -                        }
 -                    }
 +            }
 +            post {
 +              always {
 +                  warnError('missing test xml files') {
 +                      script {
 +                          copyTestResults('cqlsh-tests', cqlsh.getNumber())
 +                      }
 +                  }
                  }
 -              }
              }
            }
 -      }
 -      stage('Distributed Test') {
 +        }
 +    }
 +    stage('Distributed Test') {
          parallel {
            stage('dtest') {
              steps {
@@@ -246,23 -222,6 +258,24 @@@
                }
              }
            }
 +          stage('dtest-offheap') {
 +            steps {
 +              script {
 +                dtest_offheap = build job: "${env.JOB_NAME}-dtest-offheap", 
propagate: false
 +                if (dtest_offheap.result != 'SUCCESS') 
unstable('dtest-offheap failures')
++                if (dtest_offheap.result == 'FAILURE') 
currentBuild.result='FAILURE'
 +              }
 +            }
 +            post {
 +              always {
 +                warnError('missing test xml files') {
 +                    script {
 +                        copyTestResults('dtest-offheap', 
dtest_offheap.getNumber())
 +                    }
 +                }
 +              }
 +            }
 +          }
          }
      }
      stage('Summary') {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to