diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-08-10 17:53:28 -0400 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-08-10 17:53:28 -0400 |
| commit | 2a358f2f31662cac2f06f755c6070e7817708298 (patch) | |
| tree | 7c3f1622d95f584ab8eec2157241029a83651b1a /jenkins | |
| parent | 5a7b1030115057f0448007db8bd5bb0a5d27aadb (diff) | |
| download | build_control-2a358f2f31662cac2f06f755c6070e7817708298.tar.gz | |
Generalize miniconda installer selection
Diffstat (limited to 'jenkins')
| -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 3c4ac1a..c3c701d 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -18,10 +18,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.7":"Miniconda2-${CONDA_VERSION}-Linux-x86_64.sh", - "Linux-py3.5":"Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh", - "MacOSX-py2.7":"Miniconda2-${CONDA_VERSION}-MacOSX-x86_64.sh", - "MacOSX-py3.5":"Miniconda3-${CONDA_VERSION}-MacOSX-x86_64.sh"] +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"] // Values controlling the conda index stage which happens after any packages are created. this.max_publication_tries = 5 @@ -159,8 +159,10 @@ node(LABEL) { sh "false" } + //def conda_installer = + // this.conda_installers["${this.OSname}-py${PY_VERSION}"] def conda_installer = - this.conda_installers["${this.OSname}-py${PY_VERSION}"] + this.conda_installers["${this.OSname}-py${this.py_maj_version}"] dl_cmd = dl_cmd + " ${CONDA_BASE_URL}/${conda_installer}" sh dl_cmd |