jenkins mmc: fixed release-image builds

Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2021-11-29 10:39:51 +01:00
parent d33d96c505
commit 87e59c35ed
1 changed files with 2 additions and 0 deletions

View File

@ -167,6 +167,7 @@ def cleanLeftOvers(cleaningDir) {
def build(imgType) {
sshagent (credentials: [env.SSH_ID]) {
def tgtImgType = "${imgType}" == "bootloader" ? "dev" : "${imgType}"
tgtImgType = "${tgtImgType}" == "release" ? "" : "${tgtImgType}"
def imgTypePostfix = "${tgtImgType}" == "" ? "" : "-${tgtImgType}"
sh "bash -c '. ./env.image-ostree > /dev/null && bitbake -q -k netmodule-linux-image${imgTypePostfix}'"
}
@ -195,6 +196,7 @@ def createImagePackage(imgType, outputDir) {
dir (outputDir) {
println "get image artifacts for package..."
def imgTypePostfix = "${imgType}" == "" ? "" : "-${imgType}"
imgTypePostfix = "${imgTypePostfix}" == "-release" ? "" : "${imgTypePostfix}"
def image_basename = "netmodule-linux-image${imgTypePostfix}-${params.MACHINE}"
def basename_built = "${env.YOCTO_DEPLOYS}/${image_basename}"
def basename_archive = "./image${imgTypePostfix}-${params.MACHINE}"