Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Mick Semb Wever 2020-05-06 13:11:25 +02:00
commit 4d27eb424e
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
1 changed files with 20 additions and 10 deletions

30
.jenkins/Jenkinsfile vendored
View File

@ -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 {
@ -63,9 +61,7 @@ pipeline {
}
stage('fqltool') {
steps {
warnError('Tests unstable') {
build job: "${env.JOB_NAME}-fqltool-test"
}
build job: "${env.JOB_NAME}-fqltool-test"
}
post {
success {
@ -345,13 +341,27 @@ pipeline {
}
stage('Summary') {
steps {
junit '**/TEST*.xml,**/cqlshlib.xml,**/nosetests.xml'
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: "${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"}'
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"}
'''
}
}
}