diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-12-21 11:09:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 11:09:42 -0500 |
| commit | 94f528f0c14268905d35a97182fa48c7790bf027 (patch) | |
| tree | b0becc7e5dd8a63734170eb64d1e10e5af8b6409 /jenkins/dispatch.groovy | |
| parent | 2bdf23cd6045130ab30bbdd5d89f7792471b2e9d (diff) | |
| parent | 677c70ca9eb92f28f8fc9417977c5bc90cd8028a (diff) | |
| download | build_control-94f528f0c14268905d35a97182fa48c7790bf027.tar.gz | |
Merge pull request #47 from rendinam/conda_version_select
Select conda installer version separately from target conda version
Diffstat (limited to 'jenkins/dispatch.groovy')
| -rw-r--r-- | jenkins/dispatch.groovy | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index ed3639f..5c8f0a6 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -8,7 +8,8 @@ // and manifest files // BUILD_CONTROL_BRANCH - Branch to obtain from build control repo // BUILD_CONTROL_TAG - Tag to obtain from build control repo -// CONDA_VERSION - First, then the version is forced to this value. +// CONDA_INSTALLER_VERSION - Conda installer version to use +// CONDA_VERSION - conda version is forced to this value // CONDA_BUILD_VERSION - Conda-build is installed forced to this version. // CONDA_BASE_URL - Where to get the conda installer // UTILS_REPO - Repository holding support utilities @@ -20,10 +21,10 @@ this.recipes_dir = "conda-recipes" this.build_status_file = "propagated_build_status" // The conda installer script to use for various <OS><py_version> combinations. -this.conda_installers = ["Linux-py2":"Miniconda2-${CONDA_VERSION}-Linux-x86_64.sh", - "Linux-py3":"Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh", - "MacOSX-py2":"Miniconda2-${CONDA_VERSION}-MacOSX-x86_64.sh", - "MacOSX-py3":"Miniconda3-${CONDA_VERSION}-MacOSX-x86_64.sh"] +this.conda_installers = ["Linux-py2":"Miniconda2-${CONDA_INSTALLER_VERSION}-Linux-x86_64.sh", + "Linux-py3":"Miniconda3-${CONDA_INSTALLER_VERSION}-Linux-x86_64.sh", + "MacOSX-py2":"Miniconda2-${CONDA_INSTALLER_VERSION}-MacOSX-x86_64.sh", + "MacOSX-py3":"Miniconda3-${CONDA_INSTALLER_VERSION}-MacOSX-x86_64.sh"] // Values controlling the conda index stage which happens after any packages are created. this.max_publication_tries = 5 @@ -126,6 +127,7 @@ node(LABEL) { "PY_VERSION: ${PY_VERSION}\n" + "NUMPY_VERSION: ${NUMPY_VERSION}\n" + "MANIFEST_FILE: ${MANIFEST_FILE}\n" + + "CONDA_INSTALLER_VERSION: ${CONDA_INSTALLER_VERSION}\n" + "CONDA_VERSION: ${CONDA_VERSION}\n" + "CONDA_BUILD_VERSION: ${CONDA_BUILD_VERSION}\n" + "CONDA_BASE_URL: ${CONDA_BASE_URL}\n" + |