Jenkins: clean QEMU build files

This commit is contained in:
Christian Poessinger 2020-10-17 22:53:00 +02:00
parent 3ab7b74f89
commit ce7cdb649a
2 changed files with 13 additions and 17 deletions

18
Jenkinsfile vendored
View File

@ -152,9 +152,9 @@ pipeline {
} }
} }
} }
stage('Test ISO') { stage('QEMU') {
parallel { parallel {
stage('Without vyos-configd') { stage('Testcases without vyos-configd') {
when { when {
expression { fileExists 'build/live-image-amd64.hybrid.iso' } expression { fileExists 'build/live-image-amd64.hybrid.iso' }
} }
@ -162,7 +162,7 @@ pipeline {
sh "sudo make test" sh "sudo make test"
} }
} }
stage('With vyos-configd') { stage('Testcases with vyos-configd') {
when { when {
expression { fileExists 'build/live-image-amd64.hybrid.iso' } expression { fileExists 'build/live-image-amd64.hybrid.iso' }
} }
@ -170,9 +170,7 @@ pipeline {
sh "sudo make testd" sh "sudo make testd"
} }
} }
} stage('Build QEMU image') {
}
stage('QEMU image') {
when { when {
expression { fileExists 'build/live-image-amd64.hybrid.iso' } expression { fileExists 'build/live-image-amd64.hybrid.iso' }
} }
@ -181,6 +179,8 @@ pipeline {
} }
} }
} }
}
}
post { post {
success { success {
script { script {
@ -229,11 +229,7 @@ pipeline {
echo 'One way or another, I have finished' echo 'One way or another, I have finished'
// the 'build' directory got elevated permissions during the build // the 'build' directory got elevated permissions during the build
// cdjust permissions so it can be cleaned up by the regular user // cdjust permissions so it can be cleaned up by the regular user
sh ''' sh 'sudo make purge'
if [ -d build ]; then
sudo chmod -R 777 build/
fi
'''
deleteDir() /* cleanup our workspace */ deleteDir() /* cleanup our workspace */
} }
} }

View File

@ -262,4 +262,4 @@ clean:
.PHONY: purge .PHONY: purge
purge: purge:
rm -rf build/* rm -rf build packer_build packer_cache