jenkins: removed lock since there are concurent builds disabled
This commit is contained in:
parent
6d726a09ae
commit
2dcd22de7a
|
|
@ -17,8 +17,6 @@ pipeline {
|
||||||
PACKAGE_NAME = 'nm-os'
|
PACKAGE_NAME = 'nm-os'
|
||||||
SLACK_TOKEN = '54fghFEpv1Rmf6GJ4gJ7cL2y'
|
SLACK_TOKEN = '54fghFEpv1Rmf6GJ4gJ7cL2y'
|
||||||
|
|
||||||
LOCK_BUILD = "buildjob"
|
|
||||||
|
|
||||||
MACHINE = "${MACHINE_TYPE}"
|
MACHINE = "${MACHINE_TYPE}"
|
||||||
|
|
||||||
SHARED_BUILD = "${WORKSPACE}/build"
|
SHARED_BUILD = "${WORKSPACE}/build"
|
||||||
|
|
@ -65,24 +63,20 @@ pipeline {
|
||||||
stage('clean') {
|
stage('clean') {
|
||||||
when { expression { return params.CLEAN_BUILD } }
|
when { expression { return params.CLEAN_BUILD } }
|
||||||
steps {
|
steps {
|
||||||
lock("${env.LOCK_BUILD}") {
|
dir ("${SHARED_BUILD}/tmp") { deleteDir() }
|
||||||
dir ("${SHARED_BUILD}/tmp") { deleteDir() }
|
dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
|
||||||
dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('build') {
|
stage('build') {
|
||||||
steps {
|
steps {
|
||||||
lock("${env.LOCK_BUILD}") {
|
script {
|
||||||
script {
|
build_and_archive()
|
||||||
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"
|
|
||||||
}
|
}
|
||||||
|
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
|
} // stages
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue