natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Mick Semb Wever 2020-09-30 21:28:44 +02:00
parent 7b190b8d83 f5d5e72f61
commit 936a81bf34
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.jenkins/Jenkinsfile vendored
View File

@ -43,6 +43,7 @@ pipeline {
script {
stress = build job: "${env.JOB_NAME}-stress-test", propagate: false
if (stress.result != 'SUCCESS') unstable('stress test failures')
if (stress.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -60,6 +61,7 @@ pipeline {
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 {
@ -77,6 +79,7 @@ pipeline {
script {
jvm_dtest = build job: "${env.JOB_NAME}-jvm-dtest", propagate: false
if (jvm_dtest.result != 'SUCCESS') unstable('jvm-dtest failures')
if (jvm_dtest.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -94,6 +97,7 @@ pipeline {
script {
jvm_dtest_upgrade = build job: "${env.JOB_NAME}-jvm-dtest-upgrade", propagate: false
if (jvm_dtest_upgrade.result != 'SUCCESS') unstable('jvm-dtest-upgrade failures')
if (jvm_dtest_upgrade.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -111,6 +115,7 @@ pipeline {
script {
test = build job: "${env.JOB_NAME}-test", propagate: false
if (test.result != 'SUCCESS') unstable('unit test failures')
if (test.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -128,6 +133,7 @@ pipeline {
script {
long_test = build job: "${env.JOB_NAME}-long-test", propagate: false
if (long_test.result != 'SUCCESS') unstable('long unit test failures')
if (long_test.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -145,6 +151,7 @@ pipeline {
script {
burn = build job: "${env.JOB_NAME}-test-burn", propagate: false
if (burn.result != 'SUCCESS') unstable('burn test failures')
if (burn.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -162,6 +169,7 @@ pipeline {
script {
cdc = build job: "${env.JOB_NAME}-test-cdc", propagate: false
if (cdc.result != 'SUCCESS') unstable('cdc failures')
if (cdc.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -179,6 +187,7 @@ pipeline {
script {
compression = build job: "${env.JOB_NAME}-test-compression", propagate: false
if (compression.result != 'SUCCESS') unstable('compression failures')
if (compression.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -196,6 +205,7 @@ pipeline {
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 {
@ -217,6 +227,7 @@ pipeline {
script {
dtest = build job: "${env.JOB_NAME}-dtest", propagate: false
if (dtest.result != 'SUCCESS') unstable('dtest failures')
if (dtest.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -234,6 +245,7 @@ pipeline {
script {
dtest_large = build job: "${env.JOB_NAME}-dtest-large", propagate: false
if (dtest_large.result != 'SUCCESS') unstable('dtest-large failures')
if (dtest_large.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -251,6 +263,7 @@ pipeline {
script {
dtest_novnode = build job: "${env.JOB_NAME}-dtest-novnode", propagate: false
if (dtest_novnode.result != 'SUCCESS') unstable('dtest-novnode failures')
if (dtest_novnode.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -268,6 +281,7 @@ pipeline {
script {
dtest_offheap = build job: "${env.JOB_NAME}-dtest-offheap", propagate: false
if (dtest_offheap.result != 'SUCCESS') unstable('dtest-offheap failures')
if (dtest_offheap.result == 'FAILURE') currentBuild.result='FAILURE'
}
}
post {
@ -311,10 +325,14 @@ ${FAILED_TESTS,maxTests=500,showMessage=false,showStack=false}
${FILE,path="cassandra-test-report.txt"}
'''
}
sh "echo \"cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`\" > builds.head"
sh "find . -type f -name \\*.head -exec cat {} \\;"
sh "xz cassandra-test-report.txt TESTS-TestSuites.xml"
}
post {
always {
archiveArtifacts artifacts: 'cassandra-test-report.txt', fingerprint: true
archiveArtifacts artifacts: 'cassandra-test-report.txt.xz', fingerprint: true
sshPublisher(publishers: [sshPublisherDesc(configName: 'Nightlies', transfers: [sshTransfer(remoteDirectory: 'cassandra/${JOB_NAME}/${BUILD_NUMBER}/', sourceFiles: 'cassandra-test-report.txt.xz, TESTS-TestSuites.xml.xz')])])
}
}
}

21
build.xml
View File

@ -1862,12 +1862,6 @@
testtag="@{testtag}" showoutput="false" >
<optjvmargs/>
</testmacrohelper>
<junitreport todir="${build.test.dir}">
<fileset dir="${build.test.dir}/output">
<include name="**/TEST-*.xml"/>
</fileset>
<report format="frames" todir="${build.test.dir}/junitreport"/>
</junitreport>
<fail message="Some test(s) failed.">
<condition>
<and>
@ -1886,12 +1880,6 @@
<attribute name="testdelegate"/>
<sequential>
<testparallelhelper testdelegate="@{testdelegate}"/>
<junitreport todir="${build.test.dir}">
<fileset dir="${build.test.dir}/output">
<include name="**/TEST-*.xml"/>
</fileset>
<report format="frames" todir="${build.test.dir}/junitreport"/>
</junitreport>
<fail message="Some test(s) failed.">
<condition>
<and>
@ -1994,6 +1982,15 @@
<testparallel testdelegate="testlist"/>
</target>
<target name="generate-test-report" description="Generates JUnit's HTML report from results already in build/output">
<junitreport todir="${build.test.dir}">
<fileset dir="${build.test.dir}/output">
<include name="**/TEST-*.xml"/>
</fileset>
<report format="frames" todir="${build.test.dir}/junitreport"/>
</junitreport>
</target>
<!-- run a list of tests as provided in -Dtest.classlistfile (or default of 'testnames.txt')
The class list file should be one test class per line, with the path starting after test/unit
e.g. org/apache/cassandra/hints/HintMessageTest.java -->