Commit e0d70f7c authored by Harald Sitter's avatar Harald Sitter

separate install runs from test runs

parent 3299606c
......@@ -11,17 +11,16 @@ cleanNode('master') {
stage('installation') {
sh 'INSTALLATION=1 bin/contain.rb /workspace/bin/bootstrap.rb'
}
stage('plasma_folder') {
// hack: move raid into main dir form where our tooling will import it
// to run the tests
sh 'cp -rv wok/raid raid'
sh 'TESTS_TO_RUN=tests/plasma_folder.pm bin/contain.rb /workspace/bin/bootstrap.rb'
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/*'
// hack: undo hack from plasma_folder
sh 'rm -rv raid || true'
// sh 'rm -f wok.tar wok.tar.xz'
// sh 'tar cfJ wok.tar.xz wok'
// archiveArtifacts 'wok.tar.xz'
......
env.DIST = 'xenial'
env.TYPE = 'user'
env.PWD_BIND = '/workspace'
cleanNode('os-autoinst') {
try {
stage('tree-wget') {
sh 'wget -q http://metadata.neon.kde.org/os-autoinst/${TYPE}.tar'
sh 'wget -q http://metadata.neon.kde.org/os-autoinst/${TYPE}.tar.sig'
}
stage('tree-verify') {
sh 'gpg2 --recv-keys "348C 8651 2066 33FD 983A 8FC4 DEAC EA00 075E 1D76"'
sh 'gpg2 --verify ${TYPE}.tar.sig'
}
stage('tree-untar') {
sh 'tar -xvf ${TYPE}.tar'
sh 'ls -lah'
}
stage('test-plasma_folder') {
sh 'TESTS_TO_RUN=tests/plasma_folder.pm 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 .'
}
}
def cleanNode(label = null, body) {
node(label) {
try {
// Supremely bugged causing excessive slowdown in jenkins. not sure why.
// <org.jenkinsci.plugins.livescreenshot.LiveScreenshotBuildWrapper plugin="livescreenshot@1.4.5">
// <fullscreenFilename>screenshot.png</fullscreenFilename>
// <thumbnailFilename>screenshot-thumb.png</thumbnailFilename>
// </org.jenkinsci.plugins.livescreenshot.LiveScreenshotBuildWrapper>
wrap([$class: 'AnsiColorBuildWrapper', colorMapName: 'xterm']) {
wrap([$class: 'TimestamperBuildWrapper']) {
body()
}
}
} finally {
cleanWs()
}
}
}
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