diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2018-05-02 17:17:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 17:17:01 -0400 |
| commit | 8224c5ba3d86a5761b92afab6139f099b4e0c0d4 (patch) | |
| tree | f75ac0d0bae42c2543ac0412e517d41d51ccdb74 | |
| parent | 9c854acaf7c886d7c27876057e74e822e475bebc (diff) | |
| parent | 56a8510b6c913803aa0bcef448d3b912e63a29fe (diff) | |
| download | build_control-8224c5ba3d86a5761b92afab6139f099b4e0c0d4.tar.gz | |
Merge pull request #65 from rendinam/rambo_select
Add git ref parameter and checkout logic for obtaining build support utility.
| -rw-r--r-- | jenkins/dispatch.groovy | 4 | ||||
| -rw-r--r-- | jenkins/generator_DSL.groovy | 4 | ||||
| -rw-r--r-- | jenkins/multi_suite_generator.groovy | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 89aa26f..493fe72 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -140,6 +140,7 @@ node(LABEL) { "BUILD_CONTROL_REPO: ${BUILD_CONTROL_REPO}\n" + "BUILD_CONTROL_GIT_REF: ${BUILD_CONTROL_GIT_REF}\n" + "UTILS_REPO: ${UTILS_REPO}\n" + + "UTILS_REPO_GIT_REF: ${UTILS_REPO_GIT_REF}\n" + " Trigger parameters:\n" + "this.cull_manifest: ${this.cull_manifest}\n" + " Manifest values:\n" + @@ -175,6 +176,9 @@ node(LABEL) { // Get build utilities dir(this.utils_dir) { git url: UTILS_REPO + if (UTILS_REPO_GIT_REF != "") { + sh(script: "git checkout ${UTILS_REPO_GIT_REF}") + } } // Check for the availability of a download tool and then use it diff --git a/jenkins/generator_DSL.groovy b/jenkins/generator_DSL.groovy index 457fa4f..5e0921a 100644 --- a/jenkins/generator_DSL.groovy +++ b/jenkins/generator_DSL.groovy @@ -91,7 +91,8 @@ for (label in labels) { "CONDA_VERSION: ${conda_version}\n" + "CONDA_BUILD_VERSION: ${conda_build_version}\n" + "CONDA_BASE_URL: ${conda_base_URL}\n" + - "UTILS_REPO: ${utils_repo}\n") + "UTILS_REPO: ${utils_repo}\n" + + "UTILS_REPO_GIT_REF: ${utils_repo_git_ref}\n") environmentVariables { env("JOB_DEF_GENERATION_TIME", job_def_generation_time) env("SCRIPT", this.dispatch_script) @@ -107,6 +108,7 @@ for (label in labels) { env("CONDA_BUILD_VERSION", conda_build_version) env("CONDA_BASE_URL", conda_base_URL) env("UTILS_REPO", utils_repo) + env("UTILS_REPO_GIT_REF", utils_repo_git_ref) } definition { cps { diff --git a/jenkins/multi_suite_generator.groovy b/jenkins/multi_suite_generator.groovy index 60717fe..cbc3b8a 100644 --- a/jenkins/multi_suite_generator.groovy +++ b/jenkins/multi_suite_generator.groovy @@ -53,6 +53,7 @@ node("master") { "conda_build_version: ${this.conda_build_version}\n" + "conda_base_URL: ${this.conda_base_URL}\n" + "utils_repo: ${this.utils_repo}\n" + + "utils_repo_git_ref: ${this.utils_repo_git_ref}\n" + "old_jobs_action: ${this.old_jobs_action}\n" + " Other values:\n" + "dsl_script: ${this.dsl_script}") |