diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-05-23 14:22:49 -0400 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-05-23 14:22:49 -0400 |
| commit | e0888b607157fed223386eb7734c031964bf265c (patch) | |
| tree | 11ebe4ce8354278b15a489060c209c6655cbc63f | |
| parent | f88ffdc460a4c543ebba39426b4ef36ec9768c8f (diff) | |
| download | build_control-e0888b607157fed223386eb7734c031964bf265c.tar.gz | |
Adjust sequencing
| -rw-r--r-- | jenkins/dispatch.groovy | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index f123331..42b3535 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -124,7 +124,6 @@ node(LABEL) { // Get build utilities dir(this.utils_dir) { git url: UTILS_REPO - sh "python setup.py install" } // Check for the availability of a download tool and then use it @@ -155,7 +154,7 @@ 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}" + env.PATH = "${env.WORKSPACE}/miniconda/bin:${env.PATH}" sh "conda install --quiet conda=${CONDA_VERSION}" sh "conda install --quiet --yes conda-build=${CONDA_BUILD_VERSION}" @@ -167,6 +166,8 @@ node(LABEL) { def full_patchname = "${patches_dir}/${patchname}" sh "patch ${filename} ${full_patchname}" + // Install support tools + sh "python setup.py install" } stage("Generate build list") { |