diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-12-21 11:08:26 -0500 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-12-21 11:08:26 -0500 |
| commit | 677c70ca9eb92f28f8fc9417977c5bc90cd8028a (patch) | |
| tree | b0becc7e5dd8a63734170eb64d1e10e5af8b6409 /jenkins | |
| parent | c79da534cb9e490139d7dfc6df4d2f3e3bc6b875 (diff) | |
| download | build_control-677c70ca9eb92f28f8fc9417977c5bc90cd8028a.tar.gz | |
Select conda installer version separately from target conda version
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/dispatch.groovy | 12 | ||||
| -rw-r--r-- | jenkins/generator_DSL.groovy | 3 | ||||
| -rw-r--r-- | jenkins/job-suite-generator.groovy | 1 |
3 files changed, 11 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" + diff --git a/jenkins/generator_DSL.groovy b/jenkins/generator_DSL.groovy index cace2f5..e181455 100644 --- a/jenkins/generator_DSL.groovy +++ b/jenkins/generator_DSL.groovy @@ -47,6 +47,7 @@ for (label in labels.trim().tokenize()) { "build control repo: ${build_control_repo}\n" + "build control branch: ${build_control_branch}\n" + "build control tag: ${build_control_tag}\n" + + "conda installer version: ${conda_installer_version}\n" + "conda version: ${conda_version}\n" + "conda-build version: ${conda_build_version}\n" + "utils_repo: ${utils_repo}\n" + @@ -81,6 +82,7 @@ for (label in labels.trim().tokenize()) { "BUILD_CONTROL_REPO: ${build_control_repo}\n" + "BUILD_CONTROL_BRANCH: ${build_control_branch}\n" + "BUILD_CONTROL_TAG: ${build_control_tag}\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" + @@ -95,6 +97,7 @@ for (label in labels.trim().tokenize()) { env("BUILD_CONTROL_REPO", build_control_repo) env("BUILD_CONTROL_BRANCH", build_control_branch) env("BUILD_CONTROL_TAG", build_control_tag) + env("CONDA_INSTALLER_VERSION", conda_installer_version) env("CONDA_VERSION", conda_version) env("CONDA_BUILD_VERSION", conda_build_version) env("CONDA_BASE_URL", conda_base_URL) diff --git a/jenkins/job-suite-generator.groovy b/jenkins/job-suite-generator.groovy index 2ce1453..79ef934 100644 --- a/jenkins/job-suite-generator.groovy +++ b/jenkins/job-suite-generator.groovy @@ -73,6 +73,7 @@ node("master") { "labels: ${this.labels}\n" + "py_versions: ${this.py_versions}\n" + "numpy_versions: ${this.numpy_versions}\n" + + "conda_installer_version: ${this.conda_insaller_version}\n" + "conda_version: ${this.conda_version}\n" + "conda_build_version: ${this.conda_build_version}\n" + "conda_base_URL: ${this.conda_base_URL}\n" + |