Commit 7e8aca98 authored by Harald Sitter's avatar Harald Sitter 🌼

we don't actually clean up things

parent 4b58c631
......@@ -16,51 +16,45 @@ if (env.TYPE == null) {
error 'TYPE param not set. Cannot run install test without a type.'
}
cleanNode('master') {
ws('/tmp/kde-os-autoinst') {
try {
stage('clone') {
git 'https://github.com/apachelogger/kde-os-autoinst'
}
stage('rake-test') {
sh 'rake test'
}
stage('iso-handover') {
if (params.ISO) {
echo 'Picking up ISO from trigger job.'
sh "cp -v ${params.ISO} incoming.iso"
}
}
stage('test_installation') {
wrap([$class: 'LiveScreenshotBuildWrapper', fullscreenFilename: 'wok/qemuscreenshot/last.png']) {
sh 'INSTALLATION=1 bin/contain.rb /workspace/bin/bootstrap.rb'
}
fancyNode('master') {
try {
stage('clone') {
git 'https://github.com/apachelogger/kde-os-autoinst'
}
stage('rake-test') {
sh 'rake test'
}
stage('iso-handover') {
if (params.ISO) {
echo 'Picking up ISO from trigger job.'
sh "cp -v ${params.ISO} incoming.iso"
}
stage('archive-raid') {
tar = "/var/www/metadata/os-autoinst/${env.TYPE}.tar"
sh "tar --exclude=*.iso --exclude=*.iso.* --exclude=*socket --exclude=wok/video.ogv --exclude=wok/ulogs --exclude=wok/testresults -cf ${tar}.new ."
sh "gpg2 --armor --detach-sign -o ${tar}.new.sig ${tar}.new"
sh "mv -v ${tar}.new ${tar}"
sh "mv -v ${tar}.new.sig ${tar}.sig"
}
stage('test_installation') {
wrap([$class: 'LiveScreenshotBuildWrapper', fullscreenFilename: 'wok/qemuscreenshot/last.png']) {
sh 'INSTALLATION=1 bin/contain.rb /workspace/bin/bootstrap.rb'
}
} finally {
archiveArtifacts 'wok/testresults/*.png, wok/testresults/*.json, wok/ulogs/*, wok/video.ogv'
junit 'junit/*'
sh 'bin/contain.rb chown -R jenkins .'
}
stage('archive-raid') {
tar = "/var/www/metadata/os-autoinst/${env.TYPE}.tar"
sh "tar --exclude=*.iso --exclude=*.iso.* --exclude=*socket --exclude=wok/video.ogv --exclude=wok/ulogs --exclude=wok/testresults -cf ${tar}.new ."
sh "gpg2 --armor --detach-sign -o ${tar}.new.sig ${tar}.new"
sh "mv -v ${tar}.new ${tar}"
sh "mv -v ${tar}.new.sig ${tar}.sig"
}
} finally {
archiveArtifacts 'wok/testresults/*.png, wok/testresults/*.json, wok/ulogs/*, wok/video.ogv'
junit 'junit/*'
sh 'bin/contain.rb chown -R jenkins .'
}
}
def cleanNode(label = null, body) {
def fancyNode(label = null, body) {
node(label) {
try {
wrap([$class: 'AnsiColorBuildWrapper', colorMapName: 'xterm']) {
wrap([$class: 'TimestamperBuildWrapper']) {
body()
}
wrap([$class: 'AnsiColorBuildWrapper', colorMapName: 'xterm']) {
wrap([$class: 'TimestamperBuildWrapper']) {
body()
}
} finally {
// step([$class: 'WsCleanup', cleanWhenFailure: true])
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment