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 936a81bf340b6072991d763ccfbb73446820ce0f
Merge: 7b190b8 f5d5e72
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed Sep 30 21:28:44 2020 +0200
Merge branch 'cassandra-3.11' into trunk
.jenkins/Jenkinsfile | 20 +++++++++++++++++++-
build.xml | 21 +++++++++------------
2 files changed, 28 insertions(+), 13 deletions(-)
diff --cc .jenkins/Jenkinsfile
index 274891f,257ba1f..670b68c
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -55,23 -56,6 +56,24 @@@ pipeline
}
}
}
+ stage('fqltool') {
+ steps {
+ script {
+ fqltool = build job: "${env.JOB_NAME}-fqltool-test",
propagate: false
+ if (fqltool.result != 'SUCCESS') unstable('fqltool test
failures')
++ if (fqltool.result == 'FAILURE')
currentBuild.result='FAILURE'
+ }
+ }
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('fqltool-test', fqltool.getNumber())
+ }
+ }
+ }
+ }
+ }
stage('jvm-dtest') {
steps {
script {
@@@ -196,17 -187,18 +205,18 @@@
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-tests', cqlsh.getNumber())
- }
- }
+ }
+ post {
+ always {
+ warnError('missing test xml files') {
+ script {
+ copyTestResults('cqlsh-tests', cqlsh.getNumber())
+ }
+ }
}
- }
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
