Consolidating a number of these tests and using the new correlation script in the simulations repo

1 files changed, 2 insertions, 5 deletions

diff --git a/nightly.jenkinsfile b/nightly.jenkinsfile
index 1bf8542..e48d931 100644
--- a/nightly.jenkinsfile
+++ b/nightly.jenkinsfile
@@ -50,11 +50,8 @@ pipeline {
             steps {
                 sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/9.1_env_setup.sh &&\
                     source `pwd`/setup_environment &&\
-                    ./gpgpu-sim_simulations/util/job_launching/get_stats.py -R -K -k -B `cat ./gpgpu-sim_simulations/util/job_launching/apps/all-apps.list` -C TITANX_P102-2B,TITANX_P102-L1ON-2B,P100_HBM-2B > stats-9.1.csv && \
-                    PLOTDIR="jenkins/${JOB_NAME}/${BUILD_NUMBER}/correlate" && ssh [email protected] mkdir -p /home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR && \
-                    sh ./gpgpu-sim_simulations/run_hw/get_hw_data.sh && rm -rf ./gpgpu-sim_simulations/util/plotting/correl-html &&\
-                    ./gpgpu-sim_simulations/util/plotting/plot-correlation.py -c stats-9.1.csv -H ./gpgpu-sim_simulations/run_hw/ &&\
-                    scp  ./gpgpu-sim_simulations/util/plotting/correl-html/* [email protected]:/home/dynamo/a/tgrogers/website/gpgpu-sim-plots/$PLOTDIR'
+                    PLOTDIR="jenkins/${JOB_NAME}" &&\
+                    ./gpgpu-sim_simulations/util/correlation/correlate_and_publish.sh TITANX_P102-2B,TITANX_P102-L1ON-2B,P100_HBM-2B $PLOTDIR ${BUILD_NUMBER}'
             }
         }
     }