jenkins: adapted clean build behavior

Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2021-12-14 12:28:22 +01:00
parent 0ebff0951e
commit 19e6acb19c
3 changed files with 50 additions and 6 deletions

View File

@ -87,8 +87,9 @@ pipeline {
stage('clean') {
when { expression { return params.CLEAN_BUILD } }
steps {
dir ("${env.SHARED_BUILD}/tmp") { deleteDir() }
dir ("${env.SHARED_BUILD}/tmp-glibc") { deleteDir() }
script {
cleaning(params.IMAGE_TYPE)
}
}
}
@ -142,6 +143,16 @@ def printJobParameters() {
}
def cleaning(envType) {
sshagent (credentials: [env.SSH_ID]) {
def envPostFix = "${envType}" == "" ? "" : "-${envType}"
sh "bash -c '. ./env.image${envPostFix} > /dev/null && bitbake -q -fc cleanall virtual/netmodule-image'"
}
dir ("${env.SHARED_BUILD}/tmp") { deleteDir() }
dir ("${env.SHARED_BUILD}/tmp-glibc") { deleteDir() }
}
def build(envType, imgType) {
sshagent (credentials: [env.SSH_ID]) {
def envPostFix = "${envType}" == "" ? "" : "-${envType}"

View File

@ -90,8 +90,9 @@ pipeline {
stage('clean') {
when { expression { return params.CLEAN_BUILD } }
steps {
dir ("${SHARED_BUILD}/tmp") { deleteDir() }
dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
script {
cleaning(params.IMAGE_TYPE)
}
}
}
@ -163,6 +164,23 @@ def cleanLeftOvers(cleaningDir) {
sh "rm -rf ${cleaningDir}"
}
//-----------------------------------------------------------------------------
def cleaning(imgType) {
sshagent (credentials: [env.SSH_ID]) {
def tgtImgType = "${imgType}" == "bootloader" ? "dev" : "${imgType}"
tgtImgType = "${tgtImgType}" == "release" ? "" : "${tgtImgType}"
def imgTypePostfix = "${tgtImgType}" == "" ? "" : "-${tgtImgType}"
def distroPostfix = "ostree"
if (tgtImgType == "vcu")
distroPostfix = "vcu"
sh "bash -c '. ./env.image-${distroPostfix} > /dev/null && bitbake -q -fc cleanall netmodule-linux-image${imgTypePostfix}'"
}
dir ("${env.SHARED_BUILD}/tmp") { deleteDir() }
dir ("${env.SHARED_BUILD}/tmp-glibc") { deleteDir() }
}
//-----------------------------------------------------------------------------
def build(imgType) {
sshagent (credentials: [env.SSH_ID]) {

View File

@ -84,8 +84,9 @@ pipeline {
stage('clean') {
when { expression { return params.CLEAN_BUILD } }
steps {
dir ("${SHARED_BUILD}/tmp") { deleteDir() }
dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
script {
cleaning(env.IS_NM_LINUX_SDK.toBoolean())
}
}
}
@ -142,6 +143,20 @@ def cleanLastBuildArtifacts() {
}
}
def cleaning(isNmSdk) {
sshagent (credentials: [env.SSH_ID]) {
if(env.IS_NM_LINUX_SDK.toBoolean()) {
sh "bash -c '. ./env.image-ostree && bitbake -q -fc cleanall netmodule-linux-sdk'"
}
else {
sh "bash -c '. ./env.image-ostree && bitbake -q -fc cleanall netmodule-linux-image-dev'"
}
}
dir ("${env.SHARED_BUILD}/tmp") { deleteDir() }
dir ("${env.SHARED_BUILD}/tmp-glibc") { deleteDir() }
}
def deploySdkToArtifactory(isBuildFromDev, machine) {
def cpuType = machine.split("-")[0]