jobs/buildAll: fixed build yocto job name and added clean-up of repo
with all the changes we have had regarding seed job integration in the HAC instance the job name changed. Thus, fixing the name when triggering the build job. Additionally the script updating the source revisions leaves some unstaged changes which is resolved by adding the clean-up of the repository after building all targets. Signed-off-by: Marc Mattmüller <marc.mattmueller@netmodule.com>
This commit is contained in:
parent
705aa2c1ad
commit
a138da021e
|
|
@ -116,7 +116,7 @@ def setupEnvironment(commonHelpers) {
|
||||||
def nwlBranch = "${params.BUILD_BRANCH}"
|
def nwlBranch = "${params.BUILD_BRANCH}"
|
||||||
def nwlRepoDir = "${env.YOCTO_REPO_DIR}"
|
def nwlRepoDir = "${env.YOCTO_REPO_DIR}"
|
||||||
commonHelpers.gitCheckout("${env.YOCTO_REPO_URL}", nwlBranch, nwlRepoDir, true)
|
commonHelpers.gitCheckout("${env.YOCTO_REPO_URL}", nwlBranch, nwlRepoDir, true)
|
||||||
env.BUILD_IMG_JOB = "/build-yocto-target-pipeline/${env.BRANCH_NAME}"
|
env.BUILD_IMG_JOB = "/nwl-target"
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
@ -183,7 +183,6 @@ def buildAllTargets(commonHelpers, buildBranch) {
|
||||||
|
|
||||||
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
|
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
|
||||||
for (machine in listOfTargets) {
|
for (machine in listOfTargets) {
|
||||||
// ToDo: remove the if as soon as all machines are buildable
|
|
||||||
if(isMachineSane(machine)) {
|
if(isMachineSane(machine)) {
|
||||||
Boolean isMachineSuccess = buildMachine(commonHelpers, machine, buildBranch)
|
Boolean isMachineSuccess = buildMachine(commonHelpers, machine, buildBranch)
|
||||||
if(!isMachineSuccess && areBuildsSuccessful) {
|
if(!isMachineSuccess && areBuildsSuccessful) {
|
||||||
|
|
@ -198,4 +197,5 @@ def buildAllTargets(commonHelpers, buildBranch) {
|
||||||
error("Failing build - first machine failing = ${firstMachineFailing}")
|
error("Failing build - first machine failing = ${firstMachineFailing}")
|
||||||
}
|
}
|
||||||
} // end catchError
|
} // end catchError
|
||||||
|
commonHelpers.cleanupRepository("${env.YOCTO_REPO_DIR}")
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue