summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-07-15 12:33:00 +0200
committerChristian Breunig <christian@breunig.cc>2023-07-15 12:33:00 +0200
commitbf51cc0514800a096aa738e8a7b37e0416d8599a (patch)
treebfd422b1508c7156ca34287cd9df3e7ff6dcdd3e
parent5a81df9561242451745246060e8c271b6c8e3aa8 (diff)
downloadvyos-build-bf51cc0514800a096aa738e8a7b37e0416d8599a.tar.gz
vyos-build-bf51cc0514800a096aa738e8a7b37e0416d8599a.zip
Jenkins: make RAID1 tests opt out
-rw-r--r--Jenkinsfile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 48bf5a7d..7d27f0a6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,8 +60,9 @@ pipeline {
string(name: 'BUILD_BY', defaultValue: 'autobuild@vyos.net', description: 'Builder identifier (e.g. jrandomhacker@example.net)')
string(name: 'BUILD_VERSION', defaultValue: env.BASE_VERSION + 'ISO8601-TIMESTAMP', description: 'Version number (release builds only)')
booleanParam(name: 'BUILD_PUBLISH', defaultValue: true, description: 'Publish this build to downloads.vyos.io and AWS S3')
- booleanParam(name: 'BUILD_SMOKETESTS', defaultValue: true, description: 'Include Smoketests in ISO image')
booleanParam(name: 'BUILD_SNAPSHOT', defaultValue: false, description: 'Upload image to AWS S3 snapshot bucket')
+ booleanParam(name: 'TEST_SMOKETESTS', defaultValue: true, description: 'Run Smoketests after ISO build')
+ booleanParam(name: 'TEST_RAID1', defaultValue: true, description: 'Perform RAID1 installation tests')
}
options {
disableConcurrentBuilds()
@@ -91,7 +92,7 @@ pipeline {
currentBuild.description = sprintf('Git SHA1: %s', commitId[-11..-1])
def CUSTOM_PACKAGES = ''
- if (params.BUILD_SMOKETESTS)
+ if (params.TEST_SMOKETESTS)
CUSTOM_PACKAGES = '--custom-package vyos-1x-smoketest'
def VYOS_VERSION = params.BUILD_BY
@@ -115,6 +116,7 @@ pipeline {
stage('Smoketests for RAID-1 system installation') {
when {
expression { fileExists 'build/live-image-amd64.hybrid.iso' }
+ expression { return params.TEST_RAID1 }
}
steps {
sh "sudo make testraid"
@@ -122,7 +124,7 @@ pipeline {
}
stage('Smoketests') {
when {
- expression { return params.BUILD_SMOKETESTS }
+ expression { return params.TEST_SMOKETESTS }
}
parallel {
stage('CLI validation') {