this is ugly

Jenkinsfile

@@ -34,19 +34,16 @@ pipeline {
     COMMA_JWT = credentials('athena-test-jwt')
     TEST_DIR = "/data/openpilot"
   }
-
   stages {
-    stage('openpilot tests') {
+
+    stage('PC tests') {
       when {
         not {
           anyOf {
-            branch 'master-ci'; branch 'devel'; branch 'release2'; branch 'release2-staging'; branch 'dashcam'; branch 'dashcam-staging'
+            branch 'master-ci'; branch 'devel'; branch 'devel-staging'; branch 'release2'; branch 'release2-staging'; branch 'dashcam'; branch 'dashcam-staging'
           }
         }
       }
-      parallel {
-
-        stage('PC tests') {
       agent {
         dockerfile {
           filename 'Dockerfile.openpilot'
@@ -68,14 +65,6 @@ pipeline {
       }
     }
 
-        stage('On-device Tests') {
-          agent {
-            docker {
-              image 'python:3.7.3'
-              args '--user=root'
-            }
-          }
-          stages {
 
     stage('Release Build') {
       when {
@@ -88,6 +77,23 @@ pipeline {
       }
     }
 
+
+    stage('On-device Tests') {
+      when {
+        not {
+          anyOf {
+            branch 'master-ci'; branch 'devel'; branch 'devel-staging'; branch 'release2'; branch 'release2-staging'; branch 'dashcam'; branch 'dashcam-staging'
+          }
+        }
+      }
+      agent {
+        docker {
+          image 'python:3.7.3'
+          args '--user=root'
+        }
+      }
+      parallel {
+
         stage('Devel Build') {
           environment {
             CI_PUSH = "${env.BRANCH_NAME == 'master' ? 'master-ci' : ' '}"
@@ -123,8 +129,5 @@ pipeline {
       }
 
     }
-
-      }
-    }
   }
 }