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:55 UTC
[cassandra] branch cassandra-3.11 updated (45ac5c5 -> 0310a7e)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 45ac5c5 Merge branch 'cassandra-3.0' into cassandra-3.11
new bb2562b Jenkinsfile fixes for wrong test reports being copied, and reports getting clobbered
new 2844454 Merge branch 'cassandra-2.2' into cassandra-3.0
new 0310a7e Merge branch 'cassandra-3.0' into cassandra-3.11
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.jenkins/Jenkinsfile | 412 +++++++++------------
.../CassandraXMLJUnitResultFormatter.java | 4 +-
2 files changed, 173 insertions(+), 243 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by mc...@apache.org.
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 0310a7e42e26520cda2777bfb15a7e903c9f743a
Merge: 45ac5c5 2844454
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Aug 4 10:45:25 2020 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
.jenkins/Jenkinsfile | 412 +++++++++------------
.../CassandraXMLJUnitResultFormatter.java | 4 +-
2 files changed, 173 insertions(+), 243 deletions(-)
diff --cc .jenkins/Jenkinsfile
index bb828e3,4a640c2..9d94afb
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -26,246 -26,153 +26,187 @@@
pipeline {
agent { label 'cassandra' }
stages {
-- stage('Init') {
++ stage('Init') {
steps {
cleanWs()
}
-- }
-- stage('Build') {
++ }
++ stage('Build') {
steps {
build job: "${env.JOB_NAME}-artifacts"
}
-- }
-- stage('Test') {
- parallel {
- stage('stress') {
- steps {
- build job: "${env.JOB_NAME}-stress-test"
- }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('stress-test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('stress-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')
+ }
- }
+ }
- stage('JVM DTests') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-jvm-dtest"
++ post {
++ always {
++ warnError('missing test xml files') {
++ script {
++ copyTestResults('stress-test', stress.getNumber())
++ }
+ }
+ }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('jvm-dtest')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('jvm-dtest')
- }
- }
- }
- }
+ }
- stage('units') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test"
- }
- }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test')
- }
- }
- }
++ }
+ 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('long units') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-long-test"
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('jvm-dtest', jvm_dtest.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('long-test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('long-test')
- }
- }
- }
+ }
+ }
+ stage('units') {
+ steps {
+ script {
+ test = build job: "${env.JOB_NAME}-test", propagate: false
+ if (test.result != 'SUCCESS') unstable('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('test', test.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-burn')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-burn')
- }
- }
- }
+ }
+ }
+ 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('cdc') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test-cdc"
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('long-test', long_test.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-cdc')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-cdc')
- }
- }
- }
+ }
+ }
+ 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('cdc') {
++ steps {
++ script {
++ cdc = build job: "${env.JOB_NAME}-test-cdc", propagate: false
++ if (cdc.result != 'SUCCESS') unstable('cdc failures')
+ }
+ }
- stage('cqlsh') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-cqlsh-tests"
++ post {
++ always {
++ warnError('missing test xml files') {
++ script {
++ copyTestResults('test-cdc', cdc.getNumber())
++ }
+ }
+ }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('cqlsh-test')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('cqlsh-test')
- }
- }
- }
- }
+ }
+ }
- }
- stage('Distributed Test') {
- parallel {
- stage('dtest') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-dtest"
+ stage('compression') {
+ steps {
+ script {
+ compression = build job: "${env.JOB_NAME}-test-compression", propagate: false
+ if (compression.result != 'SUCCESS') unstable('compression failures')
+ }
+ }
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test-compression', compression.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('dtest')
- }
- }
+ }
+ }
+ 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('dtest')
- 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 {
+ 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())
}
}
}
@@@ -293,31 -194,9 +228,26 @@@
}
}
}
- stage('dtest-offheap') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-dtest-offheap"
- }
+ }
++ 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 {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('dtest-offheap')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('dtest-offheap')
- }
++ }
++ 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