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:57 UTC
[cassandra] branch trunk updated (e163855 -> 0c9336b)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from e163855 Merge branch 'cassandra-3.11' into trunk
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
new 0c9336b Merge branch 'cassandra-3.11' into trunk
The 4 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 | 294 ++++++++-------------
.../CassandraXMLJUnitResultFormatter.java | 4 +-
2 files changed, 112 insertions(+), 186 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.11' into trunk
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0c9336b4307fd1161680e09efa281122874a465f
Merge: e163855 0310a7e
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Aug 4 10:48:58 2020 +0200
Merge branch 'cassandra-3.11' into trunk
.jenkins/Jenkinsfile | 294 ++++++++-------------
.../CassandraXMLJUnitResultFormatter.java | 4 +-
2 files changed, 112 insertions(+), 186 deletions(-)
diff --cc .jenkins/Jenkinsfile
index 586c048,9d94afb..cf6afee
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -59,45 -55,18 +55,35 @@@ pipeline
}
}
}
+ stage('fqltool') {
+ steps {
- build job: "${env.JOB_NAME}-fqltool-test"
++ script {
++ fqltool = build job: "${env.JOB_NAME}-fqltool-test", propagate: false
++ if (fqltool.result != 'SUCCESS') unstable('fqltool test failures')
++ }
+ }
+ post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('fqltool-test')
- }
- }
- }
- unstable {
++ always {
+ warnError('missing test xml files') {
+ script {
- copyTestResults('fqltool-test')
++ copyTestResults('fqltool-test', fqltool.getNumber())
+ }
+ }
+ }
+ }
+ }
stage('JVM DTests') {
steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-jvm-dtest"
- }
+ script {
+ jvm_dtest = build job: "${env.JOB_NAME}-jvm-dtest", propagate: false
+ if (jvm_dtest.result != 'SUCCESS') unstable('jvm-dtest failures')
+ }
}
post {
- success {
+ always {
warnError('missing test xml files') {
script {
- copyTestResults('jvm-dtest')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('jvm-dtest')
+ copyTestResults('jvm-dtest', jvm_dtest.getNumber())
}
}
}
@@@ -172,75 -140,40 +157,40 @@@
}
}
}
- stage('cdc') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test-cdc"
- }
- }
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-cdc')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-cdc')
- }
- }
- }
+ stage('compression') {
+ steps {
+ script {
+ compression = build job: "${env.JOB_NAME}-test-compression", propagate: false
+ if (compression.result != 'SUCCESS') unstable('compression failures')
}
}
- stage('compression') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-test-compression"
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('test-compression', compression.getNumber())
+ }
}
}
- post {
- success {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-compression')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('test-compression')
- }
- }
- }
- }
}
- stage('cqlsh') {
- steps {
- warnError('Tests unstable') {
- build job: "${env.JOB_NAME}-cqlsh-tests"
- }
+ }
+ stage('cqlsh') {
+ steps {
+ script {
+ cqlsh = build job: "${env.JOB_NAME}-cqlsh-tests", propagate: false
+ if (cqlsh.result != 'SUCCESS') unstable('cqlsh failures')
+ }
- }
- post {
- always {
- warnError('missing test xml files') {
- script {
- copyTestResults('cqlsh-tests', cqlsh.getNumber())
- }
- }
+ }
+ post {
- success {
++ always {
+ warnError('missing test xml files') {
+ script {
- copyTestResults('cqlsh-tests')
- }
- }
- }
- unstable {
- warnError('missing test xml files') {
- script {
- copyTestResults('cqlsh-tests')
++ copyTestResults('cqlsh-tests', cqlsh.getNumber())
+ }
+ }
}
- }
+ }
- }
+ }
}
}
stage('Distributed Test') {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org