From a36d0bb6a0c008a3f66476bb29d1a12f0fc4074a Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Wed, 20 Sep 2017 13:48:47 -0400
Subject: Search a provided channel before searching defaults

---
 jenkins/package_builder.groovy | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'jenkins')

diff --git a/jenkins/package_builder.groovy b/jenkins/package_builder.groovy
index b7ad786..688cc25 100644
--- a/jenkins/package_builder.groovy
+++ b/jenkins/package_builder.groovy
@@ -57,7 +57,6 @@ node(this.label) {
                         "--numpy=${this.numpy_version}",
                         "--skip-existing",
                         "--override-channels",
-                        "--channel defaults",
                         "--dirty"]
                 // Use channel URL obtained from manifest in build command if
                 // manifest has been culled to allow packages being built to
@@ -67,6 +66,8 @@ node(this.label) {
                 if (this.cull_manifest == "true") {
                     args.add("--channel ${this.channel_URL}")
                 }
+                args.add("--channel defaults")
+
                 // If conda build 3.x is being used, apply any global package
                 // pin values contained in the 'pin_env' conda environment
                 // created by the dispatch job by using the --bootstrap flag
@@ -99,11 +100,12 @@ node(this.label) {
                     args = ["--test",
                             "--python=${this.py_version}",
                             "--numpy=${this.numpy_version}",
-                            "--override-channels",
-                            "--channel defaults"]
+                            "--override-channels"]
                     if (this.cull_manifest == "true") {
                         args.add("--channel ${this.channel_URL}")
                     }
+                    args.add("--channel defaults")
+
                     if (CONDA_BUILD_VERSION[0] == "3") {
                         args.add("--old-build-string")
                     }
-- 
cgit