wrap in stages

Jenkinsfile

@@ -67,48 +67,51 @@ pipeline {
             image 'python:3.7.3'
             args '--user=root'
           }
+          stages {
 
-          stage('Release Build') {
+            stage('Release Build') {
-            when {
+              when {
-              branch 'devel-staging'
+                branch 'devel-staging'
+              }
+              steps {
+                phone_steps("eon-build", [
+                  ["build release2-staging and dashcam-staging", "cd release && PUSH=1 ./build_release2.sh"],
+                ])
+              }
             }
-            steps {
-              phone_steps("eon-build", [
-                ["build release2-staging and dashcam-staging", "cd release && PUSH=1 ./build_release2.sh"],
-              ])
-            }
-          }
 
-          stage('Devel Build') {
+            stage('Devel Build') {
-            environment {
+              environment {
-              CI_PUSH = "${env.BRANCH_NAME == 'master' ? 'master-ci' : ' '}"
+                CI_PUSH = "${env.BRANCH_NAME == 'master' ? 'master-ci' : ' '}"
-            }
+              }
-            steps {
+              steps {
-              phone_steps("eon", [
+                phone_steps("eon", [
-                ["build devel", "cd release && CI_PUSH=${env.CI_PUSH} ./build_devel.sh"],
+                  ["build devel", "cd release && CI_PUSH=${env.CI_PUSH} ./build_devel.sh"],
-                ["test openpilot", "nosetests -s selfdrive/test/test_openpilot.py"],
+                  ["test openpilot", "nosetests -s selfdrive/test/test_openpilot.py"],
-                //["test cpu usage", "cd selfdrive/test/ && ./test_cpu_usage.py"],
+                  //["test cpu usage", "cd selfdrive/test/ && ./test_cpu_usage.py"],
-                ["test car interfaces", "cd selfdrive/car/tests/ && ./test_car_interfaces.py"],
+                  ["test car interfaces", "cd selfdrive/car/tests/ && ./test_car_interfaces.py"],
-              ])
+                ])
+              }
             }
-          }
 
-          stage('Replay Tests') {
+            stage('Replay Tests') {
-            steps {
+              steps {
-              phone_steps("eon2", [
+                phone_steps("eon2", [
-                ["camerad/modeld replay", "cd selfdrive/test/process_replay && ./camera_replay.py"],
+                  ["camerad/modeld replay", "cd selfdrive/test/process_replay && ./camera_replay.py"],
-              ])
+                ])
+              }
             }
-          }
 
-          stage('HW Tests') {
+            stage('HW Tests') {
-            steps {
+              steps {
-              phone_steps("eon", [
+                phone_steps("eon", [
-                ["build cereal", "SCONS_CACHE=1 scons -j4 cereal/"],
+                  ["build cereal", "SCONS_CACHE=1 scons -j4 cereal/"],
-                ["test sounds", "nosetests -s selfdrive/test/test_sounds.py"],
+                  ["test sounds", "nosetests -s selfdrive/test/test_sounds.py"],
-                ["test boardd loopback", "nosetests -s selfdrive/boardd/tests/test_boardd_loopback.py"],
+                  ["test boardd loopback", "nosetests -s selfdrive/boardd/tests/test_boardd_loopback.py"],
-              ])
+                ])
+              }
             }
+
           }
 
         }