summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-01-15 13:25:21 +0100
committerChristian Breunig <christian@breunig.cc>2023-01-18 20:53:11 +0100
commit5dec87d1b98e1b20ab100bf36a53b94b8ba35832 (patch)
tree1126e0d656fae55d6c24f41e2d2d860905197471
parent98df6df94727b6f6525684f0146ea40b17603eb2 (diff)
downloadvyos-build-5dec87d1b98e1b20ab100bf36a53b94b8ba35832.tar.gz
vyos-build-5dec87d1b98e1b20ab100bf36a53b94b8ba35832.zip
Jenkins: run RAID-1 test before smoketest to save CPU
-rw-r--r--Jenkinsfile22
1 files changed, 11 insertions, 11 deletions
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"
- }
- }
}
}
}