Merge commit '237bd3d7380719d6228e50eb2e791875a69fb416'

This commit is contained in:
Dan Hawkins 2020-02-07 12:44:24 +00:00
commit 0746e12aca
2 changed files with 1 additions and 2 deletions

View file

@ -227,7 +227,7 @@ def doBuild(apps, ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sou
// The lock is being used because it was being found that the doKillLeftovers was affecting other builds
lock(resource: "eclipsebuild_${env.NODE_NAME}") {
try {
timeout(time: 2, unit: 'MINUTES') {
timeout(time: 5, unit: 'MINUTES') {
addToolchainPath(toolchainfolder)
doImportProjects(ds5folder, toolchainfolder, ds5shellcommand, buildcommand, sourcefolder)
}

View file

@ -86,4 +86,3 @@ pipeline {
}
}
}