This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/master by this push: new 234186a In Jenkins, fix printing SHAs in pipeline summary, and compress text artifacts before uploading to nightlies.a.o 234186a is described below commit 234186acfc461b75056c251a825ccbb42f4e4fb6 Author: Mick Semb Wever <m...@apache.org> AuthorDate: Mon Sep 28 11:55:37 2020 +0200 In Jenkins, fix printing SHAs in pipeline summary, and compress text artifacts before uploading to nightlies.a.o patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-16128 --- jenkins-dsl/cassandra_job_dsl_seed.groovy | 24 ++++++++++++++++++------ jenkins-dsl/cassandra_pipeline.groovy | 7 ++++--- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy index cc40ae3..9a1694a 100644 --- a/jenkins-dsl/cassandra_job_dsl_seed.groovy +++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy @@ -301,7 +301,7 @@ matrixJob('Cassandra-template-dtest-matrix') { publishOverSsh { server('Nightlies') { transferSet { - sourceFiles("**/nosetests.xml,**/test_stdout.txt,**/ccm_logs.tar.xz") + sourceFiles("**/nosetests.xml,**/test_stdout.txt.xz,**/ccm_logs.tar.xz") remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/") } } @@ -462,7 +462,10 @@ cassandraBranches.each { node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName) } steps { - shell("./cassandra-builds/build-scripts/cassandra-test.sh ${targetName}") + shell(""" + ./cassandra-builds/build-scripts/cassandra-test.sh ${targetName} ; + xz build/test/logs/*.log + """) } } } @@ -496,7 +499,10 @@ cassandraBranches.each { node / scm / branches / 'hudson.plugins.git.BranchSpec' / name(branchName) } steps { - shell("sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh apache ${branchName} https://github.com/apache/cassandra-dtest.git master ${buildsRepo} ${buildsBranch} ${dtestDockerImage} ${targetName} \${split}/${splits}") + shell(""" + sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh apache ${branchName} https://github.com/apache/cassandra-dtest.git master ${buildsRepo} ${buildsBranch} ${dtestDockerImage} ${targetName} \${split}/${splits} ; + xz test_stdout.txt + """) } } } @@ -687,7 +693,10 @@ testTargets.each { echo "cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`" ; echo "Cassandra-devbranch-${targetName} cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-${targetName}.head ; """) - shell("./cassandra-builds/build-scripts/cassandra-test.sh ${targetName}") + shell(""" + ./cassandra-builds/build-scripts/cassandra-test.sh ${targetName} ; + xz build/test/logs/*.log + """) } publishers { publishOverSsh { @@ -793,13 +802,16 @@ dtestTargets.each { echo "cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`" ; echo "Cassandra-devbranch-${targetName} cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-${targetName}.head ; """) - shell("sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh \$REPO \$BRANCH \$DTEST_REPO \$DTEST_BRANCH ${buildsRepo} ${buildsBranch} \$DOCKER_IMAGE ${targetName} \${split}/${splits}") + shell(""" + sh ./cassandra-builds/docker/jenkins/jenkinscommand.sh \$REPO \$BRANCH \$DTEST_REPO \$DTEST_BRANCH ${buildsRepo} ${buildsBranch} \$DOCKER_IMAGE ${targetName} \${split}/${splits} ; + xz test_stdout.txt + """) } publishers { publishOverSsh { server('Nightlies') { transferSet { - sourceFiles("**/test_stdout.txt,**/ccm_logs.tar.xz") + sourceFiles("**/test_stdout.txt.xz,**/ccm_logs.tar.xz") remoteDirectory("cassandra/\${JOB_NAME}/\${BUILD_NUMBER}/") } } diff --git a/jenkins-dsl/cassandra_pipeline.groovy b/jenkins-dsl/cassandra_pipeline.groovy index d40fb93..e6547e5 100644 --- a/jenkins-dsl/cassandra_pipeline.groovy +++ b/jenkins-dsl/cassandra_pipeline.groovy @@ -244,12 +244,13 @@ pipeline { } slackSend channel: '#cassandra-builds-patches', message: ":apache: <${env.BUILD_URL}|${currentBuild.fullDisplayName}> completed: ${currentBuild.result}. <https://github.com/${REPO}/cassandra/commit/${commit_head_sha}|${REPO} ${commit_head_sha}>\n${commit_head_msg}" sh "echo \"cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`\" > builds.head" - sh "cat *.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 - sshPublisher(publishers: [sshPublisherDesc(configName: 'Nightlies', transfers: [sshTransfer(remoteDirectory: 'cassandra/${JOB_NAME}/${BUILD_NUMBER}/', sourceFiles: 'cassandra-test-report.txt, TESTS-TestSuites.xml')])]) + 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')])]) } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org