diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 384bcab850..767db54da1 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -21,7 +21,7 @@ // https://github.com/apache/cassandra-builds/blob/master/jenkins-dsl/cassandra_job_dsl_seed.groovy // // Validate/lint this file using the following command -// `curl -X POST -F "jenkinsfile=<.jenkins/Jenkinsfile" https://builds.apache.org/pipeline-model-converter/validate` +// `curl -X POST -F "jenkinsfile=<.jenkins/Jenkinsfile" https://ci-cassandra.apache.org/pipeline-model-converter/validate` pipeline { agent { label 'cassandra' } @@ -40,9 +40,7 @@ pipeline { parallel { stage('stress') { steps { - warnError('Tests unstable') { - build job: "${env.JOB_NAME}-stress-test" - } + build job: "${env.JOB_NAME}-stress-test" } post { success { @@ -319,19 +317,33 @@ pipeline { } } } - } - stage('Summary') { - steps { - junit '**/TEST*.xml,**/cqlshlib.xml,**/nosetests.xml' - - // the following should fail on any installation other than builds.apache.org - // TODO: keep jenkins infrastructure related settings in `cassandra_job_dsl_seed.groovy` - warnError('cannot send notifications') { - slackSend channel: '#cassandra-builds', message: "${currentBuild.fullDisplayName} completed: ${currentBuild.result}. See ${env.BUILD_URL}" - emailext to: 'builds@cassandra.apache.org', subject: "Build complete: ${currentBuild.fullDisplayName} [${currentBuild.result}] ${env.GIT_COMMIT}", body: '${CHANGES}  ${JELLY_SCRIPT,template="text"}' - } } + stage('Summary') { + steps { + sh "git clone https://gitbox.apache.org/repos/asf/cassandra-builds.git" + sh "./cassandra-builds/build-scripts/cassandra-test-report.sh" + junit '**/build/test/**/TEST*.xml,**/cqlshlib.xml,**/nosetests.xml' + + // the following should fail on any installation other than builds.apache.org + // TODO: keep jenkins infrastructure related settings in `cassandra_job_dsl_seed.groovy` + warnError('cannot send notifications') { + slackSend channel: '#cassandra-builds', message: ":apache: <${env.BUILD_URL}|${currentBuild.fullDisplayName}> completed: ${currentBuild.result}. ${env.GIT_COMMIT}\n${CHANGES}" + emailext to: 'builds@cassandra.apache.org', subject: "Build complete: ${currentBuild.fullDisplayName} [${currentBuild.result}] ${env.GIT_COMMIT}", body: ''' +------------------------------------------------------------------------------- +Build ${ENV,var="JOB_NAME"} #${BUILD_NUMBER} ${BUILD_STATUS} +URL: ${BUILD_URL} +------------------------------------------------------------------------------- +Changes: +${CHANGES} +------------------------------------------------------------------------------- +Failed Tests: +${FAILED_TESTS,maxTests=500,showMessage=false,showStack=false} +------------------------------------------------------------------------------- +${FILE,path="cassandra-test-report.txt"} +''' + } } + } } }