HBASE-18467 correct naming the output file for comments. correctly join the list of results.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1f068be5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1f068be5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1f068be5 Branch: refs/heads/HBASE-18467 Commit: 1f068be55deba8668650f51d9accccda3515bd6d Parents: bd44ceb Author: Sean Busbey <bus...@apache.org> Authored: Sun Aug 20 18:51:28 2017 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Mon Aug 21 08:51:41 2017 -0500 ---------------------------------------------------------------------- dev-support/Jenkinsfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1f068be5/dev-support/Jenkinsfile ---------------------------------------------------------------------- diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index f1ce069..e4ddbba 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -170,17 +170,16 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}" steps { unstash 'yetus' sh '''#!/usr/bin/env bash - mkdir -p "${OUTPUTDIR}" # for branch-1.1 we don't do jdk8 findbugs, so do it here if [ "${BRANCH_NAME}" == "branch-1.1" ]; then TESTS+=",findbugs" fi declare commentfile if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then - commentfile='${OUTPUTDIR}/success' + commentfile="${OUTPUTDIR}/success" echo '(/) *{color:green}+1 jdk7 checks{color}*' >> "${commentfile}" else - commentfile='${OUTPUTDIR}/failure' + commentfile="${OUTPUTDIR}/failure" echo '(x) *{color:red}-1 jdk7 checks{color}*' >> "${commentfile}" fi echo '-- For more information [see jdk7 report|${BUILD_URL}/JDK7_Nightly_Build_Report/]' >> "${commentfile}" @@ -235,13 +234,12 @@ curl -L -o personality.sh "${env.PROJET_PERSONALITY}" steps { unstash 'yetus' sh '''#!/usr/bin/env bash - mkdir -p "${OUTPUTDIR}" declare commentfile if "${BASEDIR}/dev-support/hbase_nightly_yetus.sh" ; then - commentfile='${OUTPUTDIR}/success' + commentfile="${OUTPUTDIR}/success" echo '(/) *{color:green}+1 jdk8 checks{color}*' >> "${commentfile}" else - commentfile='${OUTPUTDIR}/failure' + commentfile="${OUTPUTDIR}/failure" echo '(x) *{color:red}-1 jdk8 checks{color}*' >> "${commentfile}" fi echo '-- For more information [see jdk8 report|${BUILD_URL}/JDK8_Nightly_Build_Report/]' >> "${commentfile}" @@ -383,7 +381,7 @@ END echo comment echo "" echo "[DEBUG] trying to aggregate step-wise results" - comment += results.collect { fileExists(file: it) ? readFile(file: it) : "\n" }.join + comment += results.collect { fileExists(file: it) ? readFile(file: it) : "\n" }.join("\n") echo "[INFO] Comment:" echo comment echo ""