From 4a27427963ad9de3cbbbd9e8f56d2e0751a53daf Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Tue, 29 Aug 2017 14:47:23 -0400
Subject: Propagate branch and tag information

---
 jenkins/dispatch.groovy | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'jenkins/dispatch.groovy')

diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy
index fcf67d3..fcad873 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] == "/") {
-- 
cgit 


From 8554f6dc67e19618d3d69ba315ad7a2c04ba83a2 Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Tue, 29 Aug 2017 15:16:12 -0400
Subject: Propagate tag value to downstream scripts.

---
 jenkins/dispatch.groovy | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jenkins/dispatch.groovy')

diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy
index fcad873..3e17ac1 100644
--- a/jenkins/dispatch.groovy
+++ b/jenkins/dispatch.groovy
@@ -107,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" +
-- 
cgit