diff options
author | Matt Rendina <mrendina@stsci.edu> | 2017-09-06 09:41:09 -0400 |
---|---|---|
committer | Matt Rendina <mrendina@stsci.edu> | 2017-09-06 09:41:09 -0400 |
commit | 49de615ceea9da20942884a153d9269686d356c5 (patch) | |
tree | e300330946d869d805d3b58ab187fdb48b481bce /jenkins | |
parent | 9c948b7080834c91d52e0bf70b78aff0facda733 (diff) | |
download | build_control-49de615ceea9da20942884a153d9269686d356c5.tar.gz |
Add channel specification to test stage arguments
Diffstat (limited to 'jenkins')
-rw-r--r-- | jenkins/package_builder.groovy | 18 |
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}" } |