Index: build/jenkins/pipelines/docker-differential.Jenkinsfile =================================================================== --- build/jenkins/pipelines/docker-differential.Jenkinsfile +++ build/jenkins/pipelines/docker-differential.Jenkinsfile @@ -19,9 +19,26 @@ def compilers = ["gcc6"] + +def updatesMap = compilers.collectEntries { + ["${it}": svnUpdate(it)] +} + +// docker-svn may fail, so update svn just in case. +def svnUpdate(compiler) { + return { + stage("Update: ${compiler}") { + ws("/zpool0/${compiler}") { + sh "svn up" + } + } + } +} + def patchesMap = compilers.collectEntries { ["${it}": patch(it)] } + def patch(compiler) { return { stage("Patch: ${compiler}") { @@ -109,6 +126,11 @@ } stages { + stage("Update") { + steps { + script { parallel updatesMap } + } + } stage("Patch") { steps { sh "arc patch --diff ${params.DIFF_ID} --force" Index: build/jenkins/pipelines/docker-svn.Jenkinsfile =================================================================== --- build/jenkins/pipelines/docker-svn.Jenkinsfile +++ build/jenkins/pipelines/docker-svn.Jenkinsfile @@ -67,7 +67,7 @@ } } - sh "sudo zfs destroy zpool0/${compiler}@latest" + sh "sudo zfs destroy zpool0/${compiler}@latest || true" sh "sudo zfs snapshot zpool0/${compiler}@latest" } catch (e) { sh "sudo zfs rollback zpool0/${compiler}@latest" @@ -121,7 +121,7 @@ sh "sudo zfs rollback zpool0/trunk@latest" } success { - sh "sudo zfs destroy -R zpool0/trunk@latest" + sh "sudo zfs destroy -R zpool0/trunk@latest || true" sh "sudo zfs snapshot zpool0/trunk@latest" } }