From 5dec87d1b98e1b20ab100bf36a53b94b8ba35832 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 15 Jan 2023 13:25:21 +0100
Subject: Jenkins: run RAID-1 test before smoketest to save CPU

---
 Jenkinsfile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Jenkinsfile')

diff --git a/Jenkinsfile b/Jenkinsfile
index 9d6e6539..48bf5a7d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -112,12 +112,20 @@ pipeline {
                 }
             }
         }
-        stage('Test') {
+        stage('Smoketests for RAID-1 system installation') {
+            when {
+                expression { fileExists 'build/live-image-amd64.hybrid.iso' }
+            }
+            steps {
+                sh "sudo make testraid"
+            }
+        }
+        stage('Smoketests') {
             when {
                 expression { return params.BUILD_SMOKETESTS }
             }
             parallel {
-                stage('Smoketests') {
+                stage('CLI validation') {
                     when {
                         expression { fileExists 'build/live-image-amd64.hybrid.iso' }
                     }
@@ -125,7 +133,7 @@ pipeline {
                         sh "sudo make test"
                     }
                 }
-                stage('Smoketests with vyos-configd and arbitrary config loader') {
+                stage('vyos-configd and arbitrary config loader') {
                     when {
                         expression { fileExists 'build/live-image-amd64.hybrid.iso' }
                     }
@@ -133,14 +141,6 @@ pipeline {
                         sh "sudo make testc"
                     }
                 }
-                stage('Smoketests for RAID-1 system installation') {
-                    when {
-                        expression { fileExists 'build/live-image-amd64.hybrid.iso' }
-                    }
-                    steps {
-                        sh "sudo make testraid"
-                    }
-                }
             }
         }
     }
-- 
cgit v1.2.3