From 0c7ceaec3e1d00da72621ddce7be53f3f4f53bcd Mon Sep 17 00:00:00 2001
From: tgrogers <tgrogers@purdue.edu>
Date: Tue, 4 Jun 2019 08:44:54 -0400
Subject: Another attempt at getting the correl text string right into the
 email

---
 Jenkinsfile                  |  6 ++++--
 groovy-html.success.template | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 28879b1..d192073 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -67,7 +67,8 @@ pipeline {
                     source `pwd`/setup_environment &&\
                     PLOTDIR="jenkins/${JOB_NAME}" &&\
                     ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft -C GTX480,GTX480-PTXPLUS > stats-per-kernel-4.2.csv &&\
-                    ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh stats-per-kernel-4.2.csv $PLOTDIR ${BUILD_NUMBER} | grep "Correl=" | tee correl.4.2.txt'
+                    ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh stats-per-kernel-4.2.csv $PLOTDIR ${BUILD_NUMBER} | grep "Correl=" | tee correl.4.2.txt &&\
+                    export CORREL_42=`sed "s/$/<br>/" correl.4.2.txt`"'
             }
         }
         stage('9.1-correlate'){
@@ -76,7 +77,8 @@ pipeline {
                     source `pwd`/setup_environment &&\
                     PLOTDIR="jenkins/${JOB_NAME}" &&\
                     ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B rodinia_2.0-ft,sdk-4.2 -C TITANV > stats-per-kernel-9.1.csv &&\
-                    ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh stats-per-kernel-9.1.csv $PLOTDIR ${BUILD_NUMBER} | grep "Correl=" | tee correl.9.1.txt'
+                    ./gpgpu-sim_simulations/util/plotting/correlate_and_publish.sh stats-per-kernel-9.1.csv $PLOTDIR ${BUILD_NUMBER} | grep "Correl=" | tee correl.9.1.txt
+                    export CORREL_91=`sed "s/$/<br>/" correl.9.1.txt`"'
             }
         }
         stage('archive-and-delta') {
diff --git a/groovy-html.success.template b/groovy-html.success.template
index ab9ce01..fec4628 100644
--- a/groovy-html.success.template
+++ b/groovy-html.success.template
@@ -60,16 +60,26 @@
     def JOB_NAME= build.getEnvVars()["JOB_NAME"];
     def BUILD_NUMBER= build.getEnvVars()["BUILD_NUMBER"];
     def BUILD_URL= build.getEnvVars()["BUILD_URL"];
+    
+    def CORREL_42= build.getEnvVars()["CORREL_42"];
+    def CORREL_91= build.getEnvVars()["CORREL_91"];
 %>
 
 Statistics changes since last commit:<br>
 <pre>    https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/deltas/9.1
 <pre>    https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/deltas/4.2
 <pre>        Correlation:
-<pre>            4.2:
+<pre>            4.2:<br>
+
+${CORREL_42}
+
 <pre>            https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/gtx480-cycles.html.GTX480-PTXPLUS.GTX480.html
 <pre>            https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/gtx480-cycles.html.GTX480-PTXPLUS.GTX480.appsincluded.txt
-<pre>            9.1:
+<pre>            9.1:<br>
+
+
+${CORREL_91}
+
 <pre>            https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/titanv-cycles.html.TITANV.html
 <pre>            https://engineering.purdue.edu/tgrogers/gpgpu-sim-plots/jenkins/${JOB_NAME}/${BUILD_NUMBER}/titanv-cycles.html.TITANV.appsincluded.txt
 <br><br>
-- 
cgit v1.3