LM
/
yocto-img-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jenkins: set build dir postfix in prepare stage and re-ordered cleanup in sdk 

the environment variable of the build dir postfix part was null and
thus the wrong path set up.

in the sdk prepare part there is a cleaning of left overs before
the submodules might be available.

Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2021-07-28 13:42:29 +02:00
parent 701dbdc6f0
commit 88508cb44e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile_mmcImages
View File

@ -21,10 +21,6 @@ pipeline {
environment {
IMG_OUTPUT_DIR = "tmp/build-output"
// this definition is needed for selecting the
// correct build directory
BUILD_DIR_POSTFIX = ""
}
options {
@ -48,6 +44,10 @@ pipeline {
error("Missing machine type --> select parameter MACHINE for a proper build")
}
// this definition is needed for selecting the
// correct build directory
env.BUILD_DIR_POSTFIX = ""
// load yocto common file
env.ROOTDIR = pwd()
yoctocommon = load "${env.ROOTDIR}/Jenkinsfile_Common"

10
Jenkinsfile_sdk
View File

@ -22,10 +22,6 @@ pipeline {
environment {
// SDK Build Parameter (default is recipe netmodule-linux-sdk)
IS_NM_LINUX_SDK = "${!params.BUILD_FROM_DEV_IMAGE}"
// this definition is needed for selecting the
// correct build directory
BUILD_DIR_POSTFIX = ""
}
options {
@ -49,14 +45,18 @@ pipeline {
error("Missing machine type --> select parameter MACHINE for a proper build")
}
// this definition is needed for selecting the
// correct build directory
env.BUILD_DIR_POSTFIX = ""
// load yocto common file
env.ROOTDIR = pwd()
yoctocommon = load "${env.ROOTDIR}/Jenkinsfile_Common"
// Prepare Build Environment
env.YOCTO_DEPLOYS = "${env.SHARED_BUILD}/tmp/deploy/sdk"
cleanLastBuildArtifacts()
yoctocommon.handleSubmodules("${params.RLS_VERSION}")
cleanLastBuildArtifacts()
version = yoctocommon.getVersionString("${params.RLS_VERSION}", "sdk")
env.BUILD_VERSION = "${version}"
currentBuild.displayName = "${version}-${params.MACHINE}-sdk" //replace Bitbake timestamp after building