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/dispatch.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/dispatch.groovy')
| -rw-r--r-- | jenkins/dispatch.groovy | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index fcf67d3..3e17ac1 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -64,6 +64,12 @@ node(LABEL) { // Get the manifest and build control files git branch: BUILD_CONTROL_BRANCH, url: BUILD_CONTROL_REPO + // If a tag was specified in the job-suite-generator configuration, + // explicitly check out that tag after cloning the (master) branch, + // since the 'git' pipeline step does not yet support accessing tags. + if (BUILD_CONTROL_TAG != "") { + sh(script: "git checkout tags/${BUILD_CONTROL_TAG}") + } this.manifest = readYaml file: "manifests/${MANIFEST_FILE}" if (this.manifest.channel_URL[-1..-1] == "/") { @@ -101,6 +107,7 @@ node(LABEL) { "CONDA_BASE_URL: ${CONDA_BASE_URL}\n" + "BUILD_CONTROL_REPO: ${BUILD_CONTROL_REPO}\n" + "BUILD_CONTROL_BRANCH: ${BUILD_CONTROL_BRANCH}\n" + + "BUILD_CONTROL_TAG: ${BUILD_CONTROL_TAG}\n" + "UTILS_REPO: ${UTILS_REPO}\n" + " Trigger parameters:\n" + "this.cull_manifest: ${this.cull_manifest}\n" + |