Merge pull request #13 from rendinam/deps_w_culling

Propagate additional vars to builder

4 files changed, 24 insertions, 3 deletions

diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy
index d671f28..f05d906 100644
--- a/jenkins/dispatch.groovy
+++ b/jenkins/dispatch.groovy
@@ -177,7 +177,7 @@ node(LABEL) {
         // of available package recipes.
         def culled_option = "--culled"
         if (this.cull_manifest == "false") {
-           culled_option = ""
+            culled_option = ""
         }
         def build_list_file = "build_list"
         cmd = "rambo"
@@ -205,7 +205,9 @@ node(LABEL) {
                  string(name: "py_version", value: PY_VERSION),
                  string(name: "numpy_version",
                         value: "${this.manifest.numpy_version}"),
-                 string(name: "parent_workspace", value: env.WORKSPACE)],
+                 string(name: "parent_workspace", value: env.WORKSPACE),
+                 string(name: "cull_manifest", value: this.cull_manifest),
+                 string(name: "channel_URL", value: this.manifest.channel_URL)],
               propagate: false
         }
     }
diff --git a/jenkins/generator_DSL.groovy b/jenkins/generator_DSL.groovy
index de58455..c14efec 100644
--- a/jenkins/generator_DSL.groovy
+++ b/jenkins/generator_DSL.groovy
@@ -88,6 +88,12 @@ for(pkg in config.packages) {
             stringParam("manifest_file",
                         "manifest_file-DEFAULTVALUE",
                         "Manifest (release) file to use for the build.")
+            stringParam("cull_manifest",
+                        "cull_manifest-DEFAULTVALUE",
+                        "Was the manifest culled as part of dispatch?")
+            stringParam("channel_URL",
+                        "channel_URL-DEFAULTVALUE",
+                        "Publication channel used for culled builds.")
         }
         definition {
             cps {
diff --git a/jenkins/astroconda_parameterized.groovy b/jenkins/obsolete/astroconda_parameterized.groovy
index 67932ae..67932ae 100644
--- a/jenkins/astroconda_parameterized.groovy
+++ b/jenkins/obsolete/astroconda_parameterized.groovy
diff --git a/jenkins/package_builder.groovy b/jenkins/package_builder.groovy
index 92fbae4..37812ec 100644
--- a/jenkins/package_builder.groovy
+++ b/jenkins/package_builder.groovy
@@ -12,7 +12,6 @@ node(this.label) {
         "    Package Build Info Summary:\n" +
         "${time}\n" +
         "JOB_DEF_GENERATION_TIME: ${JOB_DEF_GENERATION_TIME}\n" +
-        "inherited workspace: ${this.parent_workspace}\n" +
         "this.Nodelabel: ${this.label}\n" +
         "env.JOB_BASE_NAME: ${env.JOB_BASE_NAME}\n" +
         "env.JOB_NAME: ${env.JOB_NAME}\n" +
@@ -20,7 +19,11 @@ node(this.label) {
         "env.NODE_NAME: ${env.NODE_NAME}\n" +
         "env.WORKSPACE: ${env.WORKSPACE}\n" +
         "env.JENKINS_HOME: ${env.JENKINS_HOME}\n" +
+        "parameter parent_workspace: ${this.parent_workspace}\n" +
         "parameter py_version: ${this.py_version}\n" +
+        "parameter numpy_version: ${this.numpy_version}\n" +
+        "parameter cull_manifest: ${this.cull_manifest}\n" +
+        "parameter channel_URL: ${this.channel_URL}\n" +
         "PATH: ${env.PATH}\n" +
         "PYTHONPATH: ${env.PYTHONPATH}\n" +
         "PYTHONUNBUFFERED: ${env.PYTHONUNBUFFERED}\n")
@@ -33,6 +36,15 @@ node(this.label) {
             cmd = "conda build"
 
             stage("Build") {
+                // Use channel URL obtained from manifest in build command if
+                // manifest has been culled to allow packages being built to
+                // simply download dependency packages from the publication
+                // channel as needed, rather than build them as part of the
+                // package build session that requires them.
+                def channel_option = "--channel ${this.channel_URL}"
+                if (this.cull_manifest == "false") {
+                    channel_option = ""
+                }
                 build_cmd = cmd
                 args = ["--no-test",
                         "--no-anaconda-upload",
@@ -41,6 +53,7 @@ node(this.label) {
                         "--skip-existing",
                         "--override-channels",
                         "--channel defaults",
+                        "${channel_option}",
                         "--dirty"]
                 for (arg in args) {
                     build_cmd = "${build_cmd} ${arg}"