You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/08/04 08:54:54 UTC
[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2844454669f41eca8113a97e01b59c3a74a14448
Merge: 8b8ec94 bb2562b
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Aug 4 10:44:11 2020 +0200
Merge branch 'cassandra-2.2' into cassandra-3.0
.jenkins/Jenkinsfile | 296 +++++++++------------
.../CassandraXMLJUnitResultFormatter.java | 4 +-
2 files changed, 123 insertions(+), 177 deletions(-)
diff --cc .jenkins/Jenkinsfile
index 2b371c0,dc5982a..4a640c2
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -37,191 -37,125 +37,142 @@@ pipeline
}
}
stage('Test') {
- parallel {
- stage('JVM DTests') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-jvm-dtest"
- }
- }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('jvm-dtest')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('jvm-dtest')
- }
- }
- }
+ parallel {
+ stage('JVM DTests') {
+ steps {
+ script {
+ jvm_dtest = build job: "${env.JOB_NAME}-jvm-dtest", propagate: false
+ if (jvm_dtest.result != 'SUCCESS') unstable('jvm-dtest failures')
}
}
- stage('units') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test"
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('jvm-dtest', jvm_dtest.getNumber())
+ }
}
- }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test')
- }
- }
- }
}
}
- stage('long units') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-long-test"
+ }
+ stage('units') {
+ steps {
+ script {
+ test = build job: "${env.JOB_NAME}-test", propagate: false
+ if (test.result != 'SUCCESS') unstable('unit test failures')
+ }
+ }
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test', test.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('long-test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('long-test')
- }
- }
- }
+ }
+ }
+ stage('long units') {
+ steps {
+ script {
+ long_test = build job: "${env.JOB_NAME}-long-test", propagate: false
+ if (long_test.result != 'SUCCESS') unstable('long unit test failures')
}
}
- stage('burn') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test-burn"
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('long-test', long_test.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-burn')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-burn')
- }
- }
- }
+ }
+ }
+ stage('burn') {
+ steps {
+ script {
+ burn = build job: "${env.JOB_NAME}-test-burn", propagate: false
+ if (burn.result != 'SUCCESS') unstable('burn test failures')
}
}
- stage('compression') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test-compression"
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test-burn', burn.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-compression')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-compression')
- }
- }
- }
+ }
+ }
+ stage('compression') {
+ steps {
+ script {
+ compression = build job: "${env.JOB_NAME}-test-compression", propagate: false
+ if (compression.result != 'SUCCESS') unstable('compression failures')
}
}
- stage('cqlsh') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-cqlsh-tests"
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test-compression', compression.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('cqlsh-test')
- }
- }
+ }
+ }
++ stage('cqlsh') {
++ steps {
++ script {
++ cqlsh = build job: "${env.JOB_NAME}-cqlsh-tests", propagate: false
++ if (cqlsh.result != 'SUCCESS') unstable('cqlsh failures')
+ }
- unstable {
++ }
++ post {
++ always {
+ warnError('missing test xml files') {
+ script {
- copyTestResults('cqlsh-test')
++ copyTestResults('cqlsh-test', cqlsh.getNumber())
+ }
+ }
+ }
+ }
+ }
+ }
}
- }
- stage('Distributed Test') {
+ stage('Distributed Test') {
- parallel {
- stage('dtest') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-dtest"
- }
- }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('dtest')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('dtest')
- }
- }
- }
+ parallel {
+ stage('dtest') {
+ steps {
+ script {
+ dtest = build job: "${env.JOB_NAME}-dtest", propagate: false
+ if (dtest.result != 'SUCCESS') unstable('dtest failures')
}
}
- stage('dtest-large') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-dtest-large"
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('dtest', dtest.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('dtest-large')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('dtest-large')
- }
+ }
+ }
+ stage('dtest-large') {
+ steps {
+ script {
+ dtest_large = build job: "${env.JOB_NAME}-dtest-large", propagate: false
+ if (dtest_large.result != 'SUCCESS') unstable('dtest-large failures')
+ }
+ }
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('dtest-large', dtest_large.getNumber())
}
}
}
@@@ -250,7 -178,25 +195,8 @@@
}
}
}
- 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')
- }
- }
- post {
- always {
- warnError('missing test xml files') {
- script {
- copyTestResults('dtest-offheap', dtest_offheap.getNumber())
- }
- }
- }
- }
- }
}
+ }
stage('Summary') {
steps {
sh "rm -fR cassandra-builds"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org