From c75b9fa3ff17ff623c4742f6d531fd23ffa81760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=BChnel?= <kuhnel@google.com>
Date: Thu, 24 Oct 2019 09:05:54 -0700
Subject: [PATCH] rewrite of result action

---
 Jenkins/Phabricator-pipeline/Jenkinsfile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/Jenkins/Phabricator-pipeline/Jenkinsfile b/Jenkins/Phabricator-pipeline/Jenkinsfile
index 69d502a..3647407 100644
--- a/Jenkins/Phabricator-pipeline/Jenkinsfile
+++ b/Jenkins/Phabricator-pipeline/Jenkinsfile
@@ -77,17 +77,12 @@ 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 """
-            cat > ${PHAB_LOG} << EOM
-            Log files: [[${RESULT_URL}/console-log.txt | console-log.txt]], [[${RESULT_URL}/CMakeCache.txt | CMakeCache.txt]]
-            EOM
-
-            ${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/"
-            """
+            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/"
         }
     }    
 }
\ No newline at end of file