From 24db421feaba9b77ec66b160bcdaf50723ff5244 Mon Sep 17 00:00:00 2001 From: Igor Mandrigin Date: Thu, 16 Aug 2018 15:35:31 +0200 Subject: [PATCH] Don't lock Jenkins nodes for too long if possible (#desktop). Signed-off-by: Igor Mandrigin --- ci/Jenkinsfile.desktopbuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ci/Jenkinsfile.desktopbuild b/ci/Jenkinsfile.desktopbuild index 5e19278498..c0c7389e7a 100644 --- a/ci/Jenkinsfile.desktopbuild +++ b/ci/Jenkinsfile.desktopbuild @@ -94,15 +94,15 @@ def buildClojureScript() { """ } -node() { - gitHubNotify("Desktop Jenkins build job started at ${env.BUILD_URL}") +timeout(90) { + node() { + gitHubNotify("Desktop Jenkins build job started at ${env.BUILD_URL}") + } try { parallel( 'MacOS build': { - timeout(90) { node('macos1') { load "$HOME/env.groovy" - try { stage('Git & Deps') { slackNotify('MacOS build started.') @@ -158,10 +158,8 @@ node() { cleanupBuild() } } - } }, 'Linux build': { - timeout(90) { node ('linux-01') { def qt_bin = '/opt/qt59/bin' @@ -252,9 +250,10 @@ node() { } } } - } ) } catch (e) { - gitHubNotify("Desktop Jenkins build was failed or cancelled. More details at ${env.BUILD_URL}") + node() { + gitHubNotify("Desktop Jenkins build was failed or cancelled. More details at ${env.BUILD_URL}") + } } }