This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push: new 13fd251 ninja-fix sha printing 13fd251 is described below commit 13fd2515419e788c6c2b882cc1c19af0aafca2a4 Author: Mick Semb Wever <m...@apache.org> AuthorDate: Thu Apr 1 21:04:25 2021 +0200 ninja-fix sha printing --- jenkins-dsl/cassandra_job_dsl_seed.groovy | 12 ++++++------ jenkins-dsl/cassandra_pipeline.groovy | 2 +- jenkins-dsl/print-shas.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy index 437924f..37558d8 100644 --- a/jenkins-dsl/cassandra_job_dsl_seed.groovy +++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy @@ -222,7 +222,7 @@ matrixJob('Cassandra-template-test') { git clean -xdff -e build/test/jmh-result.json ; git clone --depth 1 --single-branch -b ${buildsBranch} ${buildsRepo} ; echo "cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`" ; - echo "\${BUILD_TAG}: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head + echo "\${BUILD_TAG}) cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head """) } publishers { @@ -284,7 +284,7 @@ matrixJob('Cassandra-template-dtest-matrix') { git clean -xdff ; git clone --depth 1 --single-branch -b ${buildsBranch} ${buildsRepo} ; echo "cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`" ; - echo "\${BUILD_TAG}: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head ; + echo "\${BUILD_TAG}) cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head ; """) } } @@ -351,7 +351,7 @@ matrixJob('Cassandra-template-cqlsh-tests') { buildDescription('', buildDescStr) shell("git clean -xdff") shell('./pylib/cassandra-cqlsh-tests.sh $WORKSPACE') - shell("""echo "\${BUILD_TAG}: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head """) + shell("""echo "\${BUILD_TAG}) cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head """) } } @@ -849,7 +849,7 @@ testTargets.each { git clean -xdff ${targetName == 'microbench' ? '-e build/test/jmh-result.json' : ''}; git clone --depth 1 --single-branch -b ${buildsBranch} ${buildsRepo} ; 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 + 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} \${split}/${testSplits} ; @@ -980,7 +980,7 @@ archs.each { git clean -xdff ; git clone --depth 1 --single-branch -b ${buildsBranch} ${buildsRepo} ; echo "cassandra-builds at: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`" ; - echo "Cassandra-devbranch-${targetArchName} cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-${targetArchName}.head ; + echo "Cassandra-devbranch-${targetArchName}) cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-${targetArchName}.head ; """) if (arch == "-arm64") { shell(""" @@ -1094,7 +1094,7 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') { buildDescription('', buildDescStr) shell(""" git clean -xdff ; - echo "Cassandra-devbranch-cqlsh-tests: `git log -1 --pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-cqlsh-tests.head ; + echo "Cassandra-devbranch-cqlsh-tests) cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-cqlsh-tests.head ; """) shell('./pylib/cassandra-cqlsh-tests.sh $WORKSPACE') } diff --git a/jenkins-dsl/cassandra_pipeline.groovy b/jenkins-dsl/cassandra_pipeline.groovy index 57a0b6d..62de17e 100644 --- a/jenkins-dsl/cassandra_pipeline.groovy +++ b/jenkins-dsl/cassandra_pipeline.groovy @@ -315,7 +315,7 @@ pipeline { echo "sha: ${commit_head_sha}; msg: ${commit_head_msg}" } 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 "echo \"summary) cassandra-builds: `git -C cassandra-builds log -1 --pretty=format:'%h %an %ad %s'`\" > builds.head" sh "./cassandra-builds/jenkins-dsl/print-shas.sh" sh "xz TESTS-TestSuites.xml" sh "echo \"For test report and logs see https://nightlies.apache.org/cassandra/devbranch/${JOB_NAME}/${BUILD_NUMBER}/\"" diff --git a/jenkins-dsl/print-shas.sh b/jenkins-dsl/print-shas.sh index 95e3dc1..4a8c4fa 100755 --- a/jenkins-dsl/print-shas.sh +++ b/jenkins-dsl/print-shas.sh @@ -4,7 +4,7 @@ # If they all match then print just them, else print every job's used SHA # -if [ $(grep ") cassandra" *.head | sort -k4 | uniq -f3 | sed -n '$=') -eq 3 ]; then +if [ $(grep ") cassandra" *.head | sort -k4 | uniq -f3 | sed -n '$=') = "3" ]; then echo "The folllowing SHAs were consistently used in all jobs in the pipeline…" grep ") cassandra" *.head | awk '{$1=$2=$3=""; print $0}' | sort -u else --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org