Cleaning up the Jenkinsile to be more sane and have emails properly work

1 files changed, 26 insertions, 13 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index b342c77..19fbae4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,28 +4,41 @@ pipeline {
         }
 
     stages {
-        stage('4.2-regress') {
+        stage('4.2-simulator-build'){
             steps {
                 sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\
                 source `pwd`/setup_environment && \
-                make -j && \
+                make -j'
+            }
+        }
+        stage('4.2-simulations-build'){
+            steps{
+                sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\
+                source `pwd`/setup_environment && \
                 rm -rf gpgpu-sim_simulations && \
                 git clone https://github.com/tgrogers/gpgpu-sim_simulations.git && \
                 cd gpgpu-sim_simulations && \
                 git checkout purdue-cluster && \
-                make -j -C ./benchmarks/src all && \
-                ./util/job_launching/run_simulations.py -N regress && \
-                ./util/job_launching/monitor_func_test.py -v -N regress'
-
-                emailext body: 'See ${BUILD_URL}',
-                    recipientProviders: [[$class: 'CulpritsRecipientProvider'],
-                            [$class: 'RequesterRecipientProvider']],
-                        subject: '[AALP Jenkins] Build #${BUILD_NUMBER} - $currentBuild.result',
-                        to: '[email protected]'
+                make -j -C ./benchmarks/src all'
+            }
+        }
+        stage('4.2-rodinia-regress'){
+            steps {
+                sh 'source /home/tgrogers-raid/a/common/gpgpu-sim-setup/4.2_env_setup.sh &&\
+                source `pwd`/setup_environment && \
+                ./gpgpu-sim_simulations/util/job_launching/run_simulations.py -N regress && \
+                ./gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress'
             }
         }
     }
+    post {
+        always{
+            emailext body: "See ${BUILD_URL}",
+                recipientProviders: [[$class: 'CulpritsRecipientProvider'],
+                    [$class: 'RequesterRecipientProvider']],
+                subject: "[AALP Jenkins] Build #${BUILD_NUMBER} - ${currentBuild.result}",
+                to: '[email protected]'
 
-
-
+        }
+    }
 }