diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-06-27 09:02:48 -0400 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-06-27 09:02:48 -0400 |
| commit | a932710d21554509e6ff09303366905a0b010e74 (patch) | |
| tree | e8e933e0fbe1c2b5d9eb6cb0495ae56a272394f3 | |
| parent | 6344eecd1f737d191b7e4330b3eb31561446420e (diff) | |
| download | build_control-a932710d21554509e6ff09303366905a0b010e74.tar.gz | |
Consolidate conda version adjustment and package installation to one operation
| -rw-r--r-- | jenkins/dispatch.groovy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 41eab8b..f3168c6 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -159,8 +159,8 @@ node(LABEL) { // Install specific versions of miniconda and conda-build sh "bash ./${conda_installer} -b -p miniconda" env.PATH = "${env.WORKSPACE}/miniconda/bin:${env.PATH}" - sh "conda install --quiet conda=${CONDA_VERSION} python=${PY_VERSION}" - sh "conda install --quiet --yes conda-build=${CONDA_BUILD_VERSION}" + def cpkgs = "conda=${CONDA_VERSION} conda-build=${CONDA_BUILD_VERSION}" + sh "conda install --quiet --yes ${cpkgs} python=${PY_VERSION}" // Apply bugfix patch to conda_build 2.1.1 - 2.1.15 - (?) def filename = "${env.WORKSPACE}/miniconda/lib/python${PY_VERSION}/" + |