From f24f72cff0e9b8cf3d8a38ed1e702f814bfde27d Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Thu, 3 Aug 2017 14:49:27 -0400 Subject: Correct lockfile path, turn off status capture --- jenkins/dispatch.groovy | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 1a3bc13..67b07b4 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -240,10 +240,11 @@ node(LABEL) { stage ("Publication") { // Copy packages built during this session to the publication path. def publication_path = "${PUBLICATION_ROOT}/${this.CONDA_PLATFORM}" - def rsync_status = sh(script: "rsync -avzr ${this.conda_build_output_dir}/*.tar.bz2 ${publication_path}") + //def rsync_status = sh(script: "rsync -avzr ${this.conda_build_output_dir}/*.tar.bz2 ${publication_path}") + sh(script: "rsync -avzr ${this.conda_build_output_dir}/*.tar.bz2 ${publication_path}") // Use a lock file to prevent two dispatch jobs that finish at the same // time from trampling each other's indexing process. - def lockfile = "${this.conda_build_output_dir}/LOCK-Jenkins" + def lockfile = "${publication_path}/LOCK-Jenkins" def file = new File(lockfile) def tries_remaining = 5 if ( file.exists() ) { @@ -258,11 +259,14 @@ node(LABEL) { } } if ( tries_remaining != 0 ) { - def lockfile_status = sh(script: "touch ${lockfile}") + //def lockfile_status = sh(script: "touch ${lockfile}") + sh(script: "touch ${lockfile}") dir(this.conda_build_output_dir) { - def index_status = sh(script: "conda index ${publication_path}") + //def index_status = sh(script: "conda index ${publication_path}") + sh(script: "conda index ${publication_path}") } - lockfile_status = sh(script: "rm -f ${lockfile}") + //lockfile_status = sh(script: "rm -f ${lockfile}") + sh(script: "rm -f ${lockfile}") } } } -- cgit