jenkins: run jungles first (commaai#1977)

* jenkins: run jungles first * inside stage
dzid26 · Jun 27, 2024 · 29f2f30 · 29f2f30
1 parent ee1d5ce
commit 29f2f30
Showing 1 changed file with 38 additions and 37 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -73,56 +73,57 @@ pipeline {
   }
 
   stages {
-    stage('panda tests') {
-      parallel {
-        stage('test dos') {
-          agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
+    stage ('Acquire resource locks') {
+      options {
+        lock(resource: "pandas")
+      }
+      stages {
+        stage('Build Docker Image') {
           steps {
-            phone_steps("panda-dos", [
-              ["build", "scons -j4"],
-              ["flash", "cd tests/ && ./reflash_internal_panda.py"],
-              ["flash jungle", "cd board/jungle && ./flash.py"],
-              ["test", "cd tests/hitl && HW_TYPES=6 pytest -n0 --durations=0 [2-9]*.py -k 'not test_send_recv'"],
-            ])
+            timeout(time: 20, unit: 'MINUTES') {
+              script {
+                sh 'git archive -v -o panda.tar.gz --format=tar.gz HEAD'
+                dockerImage = docker.build("${env.DOCKER_IMAGE_TAG}")
+              }
+            }
           }
         }
-
-        stage('test tres') {
-          agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
+        stage('jungle tests') {
           steps {
-            phone_steps("panda-tres", [
-              ["build", "scons -j4"],
-              ["flash", "cd tests/ && ./reflash_internal_panda.py"],
-              ["flash jungle", "cd board/jungle && ./flash.py"],
-              ["test", "cd tests/hitl && HW_TYPES=9 pytest -n0 --durations=0 2*.py [5-9]*.py"],
-            ])
+            script {
+              retry (3) {
+                docker_run("reset hardware", 3, "python ./tests/hitl/reset_jungles.py")
+              }
+            }
           }
         }
 
-        stage ('Acquire resource locks') {
-          options {
-            lock(resource: "pandas")
-          }
-          stages {
-            stage('Build Docker Image') {
+        stage('parallel tests') {
+          parallel {
+            stage('test tres') {
+              agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
               steps {
-                timeout(time: 20, unit: 'MINUTES') {
-                  script {
-                    sh 'git archive -v -o panda.tar.gz --format=tar.gz HEAD'
-                    dockerImage = docker.build("${env.DOCKER_IMAGE_TAG}")
-                  }
-                }
+                phone_steps("panda-tres", [
+                  ["build", "scons -j4"],
+                  ["flash", "cd tests/ && ./reflash_internal_panda.py"],
+                  ["flash jungle", "cd board/jungle && ./flash.py"],
+                  ["test", "cd tests/hitl && HW_TYPES=9 pytest -n0 --durations=0 2*.py [5-9]*.py"],
+                ])
               }
             }
-            stage('jungle tests') {
+
+            stage('test dos') {
+              agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
               steps {
-                script {
-                  retry (3) {
-                    docker_run("reset hardware", 3, "python ./tests/hitl/reset_jungles.py")
-                  }
-                }
+                phone_steps("panda-dos", [
+                  ["build", "scons -j4"],
+                  ["flash", "cd tests/ && ./reflash_internal_panda.py"],
+                  ["flash jungle", "cd board/jungle && ./flash.py"],
+                  ["test", "cd tests/hitl && HW_TYPES=6 pytest -n0 --durations=0 [2-9]*.py -k 'not test_send_recv'"],
+                ])
               }
             }
+
             stage('bootkick tests') {
               steps {
                 script {