From 9b82f79698b3ef26599061a1d35305004fb4e9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChnel?= Date: Thu, 24 Oct 2019 12:41:40 -0700 Subject: [PATCH] another try with multiline strings --- Jenkins/Phabricator-pipeline/Jenkinsfile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Jenkins/Phabricator-pipeline/Jenkinsfile b/Jenkins/Phabricator-pipeline/Jenkinsfile index c2df290..21388fa 100644 --- a/Jenkins/Phabricator-pipeline/Jenkinsfile +++ b/Jenkins/Phabricator-pipeline/Jenkinsfile @@ -77,12 +77,19 @@ pipeline { // copy console log to result folder sh "wget -qO console-log.txt http://jenkins-ui.jenkins.svc.cluster.local:8080/job/${JOB_BASE_NAME}/${BUILD_NUMBER}/consoleText" } - sh 'echo "Log files: [[${RESULT_URL}/console-log.txt | console-log.txt]], [[${RESULT_URL}/CMakeCache.txt | CMakeCache.txt]]" > ${PHAB_LOG}' - sh "${SCRIPT_DIR}/phabtalk/phabtalk.py ${PHID} ${DIFF_ID} \ - --conduit-token ${CONDUIT_TOKEN} \ - --test-result-file ${TEST_REPORT} \ - --comment-file ${PHAB_LOG} \ - --host https://reviews.llvm.org/api/" + /// send results to Phabricator + sh ''' +set +x +cat <<-EOF> ${PHAB_LOG} +Log files: [[${RESULT_URL}/console-log.txt | console-log.txt]], [[${RESULT_URL}/CMakeCache.txt | CMakeCache.txt]] +EOF +''' + sh '''${SCRIPT_DIR}/phabtalk/phabtalk.py "${PHID}" "${DIFF_ID}" \ + --conduit-token "${CONDUIT_TOKEN}" \ + --test-result-file "${TEST_REPORT}" \ + --comment-file "${PHAB_LOG}" \ + --host "https://reviews.llvm.org/api/" + ''' } } } \ No newline at end of file