Merge pull request #30 from rendinam/numpy_matrix0.2.2

Numpy 'matrix build' support; channel access in test stage

1 files changed, 11 insertions, 7 deletions

diff --git a/jenkins/package_builder.groovy b/jenkins/package_builder.groovy
index 696e121..a63c1b8 100644
--- a/jenkins/package_builder.groovy
+++ b/jenkins/package_builder.groovy
@@ -45,13 +45,14 @@ node(this.label) {
 
             cmd = "conda 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}"
+
             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 = ""
                 }
@@ -87,7 +88,10 @@ node(this.label) {
                     build_cmd = cmd
                     args = ["--test",
                             "--python=${this.py_version}",
-                            "--numpy=${this.numpy_version}"]
+                            "--numpy=${this.numpy_version}",
+                            "--override-channels",
+                            "--channel defaults",
+                            "${channel_option}"]
                     for (arg in args) {
                         build_cmd = "${build_cmd} ${arg}"
                     }