diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-08-29 15:31:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 15:31:38 -0400 |
| commit | edbad1a9da616e61e1c2f13bcc905ce010f7e904 (patch) | |
| tree | e645809a4de637692ef2e68d71d7eaf15bb95bc1 /jenkins/generator_DSL.groovy | |
| parent | 27ae0359769f81288d19acdef316e6a84925b60f (diff) | |
| parent | 8554f6dc67e19618d3d69ba315ad7a2c04ba83a2 (diff) | |
| download | build_control-edbad1a9da616e61e1c2f13bcc905ce010f7e904.tar.gz | |
Merge pull request #29 from rendinam/master0.2.1
Properly support master branch tags
Diffstat (limited to 'jenkins/generator_DSL.groovy')
| -rw-r--r-- | jenkins/generator_DSL.groovy | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/jenkins/generator_DSL.groovy b/jenkins/generator_DSL.groovy index 7dd10ea..36f65d5 100644 --- a/jenkins/generator_DSL.groovy +++ b/jenkins/generator_DSL.groovy @@ -13,9 +13,13 @@ this.script = "dispatch.groovy" this.build_control_repo = readFileFromWorkspace("VAR-build_control_repo") this.build_control_repo = this.build_control_repo.trim() + this.build_control_branch = readFileFromWorkspace("VAR-build_control_branch") this.build_control_branch= this.build_control_branch.trim() +this.build_control_tag = readFileFromWorkspace("VAR-build_control_tag") +this.build_control_tag = this.build_control_tag.trim() + // For each label (OS) in the list provided by the 'labels' job parameter, iterate // over each python version provided by the 'py_versions' job parameter, to obtain // every combination of OS and python version. Generate a separate job suite for @@ -30,7 +34,8 @@ for (label in labels.trim().tokenize()) { folder(suite_name) { description("Build suite generated: ${job_def_generation_time}\n" + "build control repo: ${build_control_repo}\n" + - "build control branch/tag: ${build_control_branch}\n" + + "build control branch: ${build_control_branch}\n" + + "build control tag: ${build_control_tag}\n" + "conda version: ${conda_version}\n" + "conda-build version: ${conda_build_version}\n" + "utils_repo: ${utils_repo}") @@ -55,6 +60,7 @@ for (label in labels.trim().tokenize()) { "PY_VERSION: ${py_version}\n" + "BUILD_CONTROL_REPO: ${build_control_repo}\n" + "BUILD_CONTROL_BRANCH: ${build_control_branch}\n" + + "BUILD_CONTROL_TAG: ${build_control_tag}\n" + "CONDA_VERSION: ${conda_version}\n" + "CONDA_BUILD_VERSION: ${conda_build_version}\n" + "CONDA_BASE_URL: ${conda_base_URL}\n" + @@ -67,6 +73,7 @@ for (label in labels.trim().tokenize()) { env("PY_VERSION", py_version) env("BUILD_CONTROL_REPO", build_control_repo) env("BUILD_CONTROL_BRANCH", build_control_branch) + env("BUILD_CONTROL_TAG", build_control_tag) env("CONDA_VERSION", conda_version) env("CONDA_BUILD_VERSION", conda_build_version) env("CONDA_BASE_URL", conda_base_URL) @@ -100,6 +107,9 @@ for (label in labels.trim().tokenize()) { stringParam("build_control_branch", "build_control_branch-DEFAULTVALUE", "Branch checked out to obtain build system scripts.") + stringParam("build_control_tag", + "build_control_tag-DEFAULTVALUE", + "Tag checked out to obtain build system scripts.") stringParam("py_version", "py_version-DEFAULTVALUE", "python version to use") |