LM
/
nwl-ci
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into ansible-instance

This commit is contained in:
Marc Mattmüller 2023-09-11 16:12:58 +02:00
parent 717b4ed219 652739e0f0
commit 1e739d0817
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jobs/Jenkinsfile_BuildAll
View File

@ -192,6 +192,7 @@ def runBuildJob(commonHelpers, buildTarget, buildBranch) {
booleanParam(name: 'CLEAN_BUILD', value: params.CLEAN_BUILD), booleanParam(name: 'CLEAN_BUILD', value: params.CLEAN_BUILD),
booleanParam(name: 'DEPLOY_TO_NEXUS', value: params.DEPLOY_TO_NEXUS), booleanParam(name: 'DEPLOY_TO_NEXUS', value: params.DEPLOY_TO_NEXUS),
booleanParam(name: 'SKIP_SSTATE_UPLOAD', value: params.SKIP_SSTATE_UPLOAD), booleanParam(name: 'SKIP_SSTATE_UPLOAD', value: params.SKIP_SSTATE_UPLOAD),
booleanParam(name: 'FORCE_SRC_REV_UPDATE', value: false),
booleanParam(name: 'DEBUGGING', value: params.DEBUGGING)] booleanParam(name: 'DEBUGGING', value: params.DEBUGGING)]
) )
} }

16
jobs/Jenkinsfile_BuildTarget
View File

@ -40,6 +40,7 @@ pipeline {
booleanParam(name: 'CLEAN_BUILD', defaultValue: false, description: 'do a clean build, i.e. remove the yocto directory and start from scratch') booleanParam(name: 'CLEAN_BUILD', defaultValue: false, description: 'do a clean build, i.e. remove the yocto directory and start from scratch')
booleanParam(name: 'DEPLOY_TO_NEXUS', defaultValue: true, description: 'deploy the built artifact to Nexus') booleanParam(name: 'DEPLOY_TO_NEXUS', defaultValue: true, description: 'deploy the built artifact to Nexus')
booleanParam(name: 'SKIP_SSTATE_UPLOAD', defaultValue: false, description: 'skip uploading/synchronizing the sstate-cache to the mirror') booleanParam(name: 'SKIP_SSTATE_UPLOAD', defaultValue: false, description: 'skip uploading/synchronizing the sstate-cache to the mirror')
booleanParam(name: 'FORCE_SRC_REV_UPDATE', defaultValue: false, description: 'force a source revision update, e.g. when you are triggering this job manually')
booleanParam(name: 'DEBUGGING', defaultValue: false, description: 'debugging mode, removes quiet mode for bitbake') booleanParam(name: 'DEBUGGING', defaultValue: false, description: 'debugging mode, removes quiet mode for bitbake')
} }
@ -121,12 +122,13 @@ def printJobParameters() {
println "----------------------------------\n\ println "----------------------------------\n\
Job Parameters:\n\ Job Parameters:\n\
----------------------------------\n\ ----------------------------------\n\
TARGET = ${params.TARGET}\n\ TARGET = ${params.TARGET}\n\
BUILD_BRANCH = ${params.BUILD_BRANCH}\n\ BUILD_BRANCH = ${params.BUILD_BRANCH}\n\
CLEAN_BUILD = ${params.CLEAN_BUILD}\n\ CLEAN_BUILD = ${params.CLEAN_BUILD}\n\
DEPLOY_TO_NEXUS = ${params.DEPLOY_TO_NEXUS}\n\ DEPLOY_TO_NEXUS = ${params.DEPLOY_TO_NEXUS}\n\
SKIP_SSTATE_UPLOAD = ${params.SKIP_SSTATE_UPLOAD}\n\ SKIP_SSTATE_UPLOAD = ${params.SKIP_SSTATE_UPLOAD}\n\
DEBUGGING = ${params.DEBUGGING}\n\ FORCE_SRC_REV_UPDATE = ${params.FORCE_SRC_REV_UPDATE}\n\
DEBUGGING = ${params.DEBUGGING}\n\
----------------------------------\n" ----------------------------------\n"
} }
@ -151,7 +153,7 @@ def setupEnvironment(commonHelpers) {
def machine = "${env.TARGET}" def machine = "${env.TARGET}"
def nwlBranch = "${params.BUILD_BRANCH}" def nwlBranch = "${params.BUILD_BRANCH}"
def nwlRepoDir = "${env.YOCTO_REPO_DIR}" def nwlRepoDir = "${env.YOCTO_REPO_DIR}"
commonHelpers.setupBuildEnvironment(machine, nwlBranch, nwlRepoDir, params.DEBUGGING) commonHelpers.setupBuildEnvironment(machine, nwlBranch, nwlRepoDir, params.DEBUGGING, params.FORCE_SRC_REV_UPDATE)
commonHelpers.printEnvironmentParameters() commonHelpers.printEnvironmentParameters()
} }

4
jobs/Jenkinsfile_Common
View File

@ -231,7 +231,7 @@ def setupEnvironmentForArtifacts(machine) {
env.YOCTO_ARTIFACTS = "${env.YOCTO_DEPLOYS}/${env.BITBAKE_PKG}-${machine}.ci-artifacts" env.YOCTO_ARTIFACTS = "${env.YOCTO_DEPLOYS}/${env.BITBAKE_PKG}-${machine}.ci-artifacts"
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
def setupBuildEnvironment(machine, branchTag, cloneDir, isDebug) { def setupBuildEnvironment(machine, branchTag, cloneDir, isDebug, isSrcRevUpdateForced) {
// with the machine parameter it will be possible to set up different // with the machine parameter it will be possible to set up different
// environment variables in here. Currently we use the SolidRun board // environment variables in here. Currently we use the SolidRun board
@ -248,7 +248,7 @@ def setupBuildEnvironment(machine, branchTag, cloneDir, isDebug) {
env.BITBAKE_CMD = "${env.ISQUIET} ${env.BITBAKE_PKG}" env.BITBAKE_CMD = "${env.ISQUIET} ${env.BITBAKE_PKG}"
removePreExistingYoctoConfigs(confPath) removePreExistingYoctoConfigs(confPath)
gitCheckout("${env.YOCTO_REPO_URL}", branchTag, cloneDir, true) gitCheckout("${env.YOCTO_REPO_URL}", branchTag, cloneDir, true, isSrcRevUpdateForced)
env.PKG_NAME = "${env.BITBAKE_PKG}-${machine}" env.PKG_NAME = "${env.BITBAKE_PKG}-${machine}"
sh("mkdir -p ${env.DEPLOY_CONTENT_DIR}") sh("mkdir -p ${env.DEPLOY_CONTENT_DIR}")