aboutsummaryrefslogtreecommitdiff
path: root/jenkins
diff options
context:
space:
mode:
authorMatt Rendina <mrendina@stsci.edu>2018-12-13 14:55:34 -0500
committerMatt Rendina <rendinam@users.noreply.github.com>2018-12-13 16:04:22 -0500
commit076de3070eefec37c4d1110059becdc3cd0befba (patch)
tree9de0c42457f2df651c8e35d17082475ac13c0ecf /jenkins
parent2461162070e378740a6dea27008621a246847287 (diff)
downloadbuild_control-076de3070eefec37c4d1110059becdc3cd0befba.tar.gz
Accommodate new conda index tool.1.0.32
Diffstat (limited to 'jenkins')
-rw-r--r--jenkins/dispatch.groovy12
1 files changed, 11 insertions, 1 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy
index 558ef05..cdc5f2c 100644
--- a/jenkins/dispatch.groovy
+++ b/jenkins/dispatch.groovy
@@ -368,8 +368,18 @@ node(LABEL) {
}
if (tries_remaining != 0) {
sh(script: "touch ${lockfile}")
+ def index_cmd = "conda index"
+ def version_vals = []
+ CONDA_BUILD_VERSION.tokenize('.').each { value -> version_vals.add(value.toInteger()) }
+ // Conda build 3.15.1 introduces new index command options and behavior.
+ if (version_vals[1] >= 15) {
+ index_cmd = "${index_cmd} -t 4 --no-progress --subdir ${this.CONDA_PLATFORM} ${this.manifest.publication_root}"
+ } else {
+ index_cmd = "${index_cmd} ${publication_path}"
+ }
+ // Update index of conda channel platform directory.
dir(this.conda_build_output_dir) {
- sh(script: "conda index ${publication_path}")
+ sh(script: "time ${index_cmd}")
}
sh(script: "rm -f ${lockfile}")
}