From af12a963ce3c0358b5465b624b9dbb2681c8572b Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Thu, 3 Aug 2017 13:56:33 -0400
Subject: Compose publication path and run index there

---
 jenkins/dispatch.groovy      | 5 +++--
 jenkins/generator_DSL.groovy | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'jenkins')

diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy
index a79ad51..8393cd8 100644
--- a/jenkins/dispatch.groovy
+++ b/jenkins/dispatch.groovy
@@ -239,7 +239,8 @@ node(LABEL) {
 
     stage ("Publication") {
        // Copy packages built during this session to the publication path.
-       sh(script: "rsync -avzr ${this.conda_build_output_dir}/*.tar.bz2 ${PUBLICATION_PATH}/${this.CONDA_PLATFORM}")
+       def publication_path = "${PUBLICATION_ROOT}/${this.CONDA_PLATFORM}"
+       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"
@@ -259,7 +260,7 @@ node(LABEL) {
        if ( tries_remaining != 0 ) {
            sh(script: "touch ${lockfile}")
            dir(this.conda_build_output_dir) {
-               sh(script: "conda index")
+               sh(script: "conda index ${publication_path}")
            }
            sh(script: "rm -f ${lockfile}")
        }
diff --git a/jenkins/generator_DSL.groovy b/jenkins/generator_DSL.groovy
index d875444..f05c46c 100644
--- a/jenkins/generator_DSL.groovy
+++ b/jenkins/generator_DSL.groovy
@@ -47,7 +47,7 @@ pipelineJob("${suite_name}/_${script.tokenize(".")[0]}") {
     "CONDA_BUILD_VERSION: ${conda_build_version}\n" +
     "CONDA_BASE_URL: ${conda_base_URL}\n" +
     "UTILS_REPO: ${utils_repo}\n" +
-    "PUBLICATION_PATH: ${publication_path}\n")
+    "PUBLICATION_ROOT: ${publication_root}\n")
     environmentVariables {
         env("JOB_DEF_GENERATION_TIME", job_def_generation_time)
         env("SCRIPT", this.script)
@@ -60,7 +60,7 @@ pipelineJob("${suite_name}/_${script.tokenize(".")[0]}") {
         env("CONDA_BUILD_VERSION", conda_build_version)
         env("CONDA_BASE_URL", conda_base_URL)
         env("UTILS_REPO", utils_repo)
-        env("PUBLICATION_PATH", publication_path)
+        env("PUBLICATION_ROOT", publication_root)
     }
     definition {
         cps {
-- 
cgit