From c4a560e340bee45d60ef499ad963bdd8fbb7cc5d Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Thu, 21 Sep 2017 14:27:59 -0400
Subject: * Use pin environment only if pin packages are specified. * Convert
 cull_manifest to proper boolean parameter.

---
 jenkins/package_builder.groovy | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'jenkins/package_builder.groovy')

diff --git a/jenkins/package_builder.groovy b/jenkins/package_builder.groovy
index 688cc25..9d7db25 100644
--- a/jenkins/package_builder.groovy
+++ b/jenkins/package_builder.groovy
@@ -1,4 +1,4 @@
-// Parameters inherited environment injection.
+// Parameters inherited via environment injection at job creation time.
 //----------------------------------------------------------------------------
 // CONDA_BUILD_VERSION  - Conda-build is installed forced to this version.
 
@@ -35,6 +35,7 @@ node(this.label) {
         "parameter numpy_version: ${this.numpy_version}\n" +
         "parameter cull_manifest: ${this.cull_manifest}\n" +
         "parameter channel_URL: ${this.channel_URL}\n" +
+        "parameter use_version_pins: ${this.use_version_pins}\n" +
         "PATH: ${env.PATH}\n" +
         "PYTHONPATH: ${env.PYTHONPATH}\n" +
         "PYTHONUNBUFFERED: ${env.PYTHONUNBUFFERED}\n")
@@ -63,7 +64,8 @@ node(this.label) {
                 // simply download dependency packages from the publication
                 // channel as needed, rather than build them as part of the
                 // package build session that requires them.
-                if (this.cull_manifest == "true") {
+                // Channel arguments are order-dependent.
+                if (this.cull_manifest) {
                     args.add("--channel ${this.channel_URL}")
                 }
                 args.add("--channel defaults")
@@ -74,7 +76,9 @@ node(this.label) {
                 // here.
                 if (CONDA_BUILD_VERSION[0] == "3") {
                     args.add("--old-build-string")
-                    args.add("--bootstrap pin_env")
+                    if (this.use_version_pins == "true") {
+                        args.add("--bootstrap pin_env")
+                    }
                 }
                 // Compose build command string to use in shell call.
                 for (arg in args) {
@@ -101,7 +105,8 @@ node(this.label) {
                             "--python=${this.py_version}",
                             "--numpy=${this.numpy_version}",
                             "--override-channels"]
-                    if (this.cull_manifest == "true") {
+                    // Channel arguments are order-dependent.
+                    if (this.cull_manifest) {
                         args.add("--channel ${this.channel_URL}")
                     }
                     args.add("--channel defaults")
-- 
cgit