jenkins: removed lock since there are concurent builds disabled

This commit is contained in:
Marc Mattmüller 2020-10-08 14:57:16 +02:00
parent 6d726a09ae
commit 2dcd22de7a
1 changed files with 8 additions and 14 deletions

22
Jenkinsfile vendored
View File

@ -17,8 +17,6 @@ pipeline {
PACKAGE_NAME = 'nm-os'
SLACK_TOKEN = '54fghFEpv1Rmf6GJ4gJ7cL2y'
LOCK_BUILD = "buildjob"
MACHINE = "${MACHINE_TYPE}"
SHARED_BUILD = "${WORKSPACE}/build"
@ -65,24 +63,20 @@ pipeline {
stage('clean') {
when { expression { return params.CLEAN_BUILD } }
steps {
lock("${env.LOCK_BUILD}") {
dir ("${SHARED_BUILD}/tmp") { deleteDir() }
dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
}
dir ("${SHARED_BUILD}/tmp") { deleteDir() }
dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
}
}
stage('build') {
steps {
lock("${env.LOCK_BUILD}") {
script {
build_and_archive()
}
dir ('tmp/artifacts') {
zip archive: true, dir: "${WORKSPACE}/tmp/build-${IMAGE_TYPE}", glob: "*", zipFile: "${PACKAGE_NAME}-${BUILD_VERSION}-${machine}-${IMAGE_TYPE}.zip"
}
sh "rm -rf ${WORKSPACE}/tmp"
script {
build_and_archive()
}
dir ('tmp/artifacts') {
zip archive: true, dir: "${WORKSPACE}/tmp/build-${IMAGE_TYPE}", glob: "*", zipFile: "${PACKAGE_NAME}-${BUILD_VERSION}-${machine}-${IMAGE_TYPE}.zip"
}
sh "rm -rf ${WORKSPACE}/tmp"
}
}
} // stages