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 87bdbb7182af2db4b868f1001cf10f1d0af763d0 Merge: ba0555e965 e163146fd9 Author: Mick Semb Wever <m...@apache.org> AuthorDate: Sun Jun 19 16:38:34 2022 +0200 Merge branch 'cassandra-2.2' into cassandra-3.0 .jenkins/Jenkinsfile | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --cc .jenkins/Jenkinsfile index ca4a0c7f24,2ecc1a3921..4ea5de3e8a --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@@ -150,36 -154,11 +154,37 @@@ pipeline } } } + stage('cqlsh') { + steps { + script { + def attempt = 1 - retry(2) { ++ while (attempt <=2) { + if (attempt > 1) { + sleep(60 * attempt) + } + attempt = attempt + 1 + cqlsh = build job: "${env.JOB_NAME}-cqlsh-tests", propagate: false ++ if (cqlsh.result != 'FAILURE') break + } + 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()) + } + } + } + } + } + } } - } - stage('Distributed Test') { + stage('Distributed Test') { parallel { - stage('JVM DTests') { + stage('jvm-dtest') { steps { script { def attempt = 1 @@@ -204,31 -184,6 +210,32 @@@ } } } + stage('jvm-dtest-upgrade') { + steps { + script { + def attempt = 1 - retry(2) { ++ while (attempt <=2) { + if (attempt > 1) { + sleep(60 * attempt) + } + attempt = attempt + 1 + jvm_dtest_upgrade = build job: "${env.JOB_NAME}-jvm-dtest-upgrade", propagate: false ++ if (jvm_dtest_upgrade.result != 'FAILURE') break + } + if (jvm_dtest_upgrade.result != 'SUCCESS') unstable('jvm-dtest-upgrade failures') + if (jvm_dtest_upgrade.result == 'FAILURE') currentBuild.result='FAILURE' + } + } + post { + always { + warnError('missing test xml files') { + script { + copyTestResults('jvm-dtest-upgrade', jvm_dtest_upgrade.getNumber()) + } + } + } + } + } stage('dtest') { steps { script { @@@ -313,10 -271,11 +323,11 @@@ sleep(60 * attempt) } attempt = attempt + 1 - dtest_offheap = build job: "${env.JOB_NAME}-dtest-offheap", propagate: false - if (dtest_offheap.result != 'FAILURE') break + dtest_large_novnode = build job: "${env.JOB_NAME}-dtest-large-novnode", propagate: false ++ if (dtest_large_novnode.result != 'FAILURE') break } - if (dtest_offheap.result != 'SUCCESS') unstable('dtest-offheap failures') - if (dtest_offheap.result == 'FAILURE') currentBuild.result='FAILURE' + if (dtest_large_novnode.result != 'SUCCESS') unstable('dtest-large-novnode failures') + if (dtest_large_novnode.result == 'FAILURE') currentBuild.result='FAILURE' } } post { @@@ -329,31 -288,6 +340,32 @@@ } } } + stage('dtest-upgrade') { + steps { + script { + def attempt = 1 - retry(2) { ++ while (attempt <=2) { + if (attempt > 1) { + sleep(60 * attempt) + } + attempt = attempt + 1 + dtest_upgrade = build job: "${env.JOB_NAME}-dtest-upgrade", propagate: false ++ if (dtest_upgrade.result != 'FAILURE') break + } + if (dtest_upgrade.result != 'SUCCESS') unstable('dtest failures') + if (dtest_upgrade.result == 'FAILURE') currentBuild.result='FAILURE' + } + } + post { + always { + warnError('missing test xml files') { + script { + copyTestResults('dtest-upgrade', dtest_upgrade.getNumber()) + } + } + } + } + } } } stage('Summary') { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org