From 6db14ceab2b3f278969245ff6cef0f6fafa7d784 Mon Sep 17 00:00:00 2001
From: Chad Redman <chad_redman@unc.edu>
Date: Wed, 12 Jan 2022 16:31:18 -0500
Subject: [PATCH] Use env.TAG_NAME instead of a pipeline parameter (params
 unavailable in multibranch pipeline)

---
 Jenkinsfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 030ff29..cb3fe80 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,11 +3,12 @@ def gpg_key = '1D3F3E9E30C7F312'
 def jdk_id = 'Corretto-JDK8'
 def maven_id = 'Maven-3.8.4'
 
-def tag_pattern = /^GROUPER_RELEASE_(\d+\.\d+\.\w+)$/
-
+def git_tag = env.TAG_NAME ?: env.BRANCH_NAME
+def tag_pattern = /^(\d+\.\d+\.\w+)$/
+def grouper_src_branch = "GROUPER_RELEASE_${git_tag}"
 
 node('docker') {
-    if (params.branch_or_tag ==~ tag_pattern) {
+    if (git_tag ==~ tag_pattern ) {
         stage("PgpImport") {
             withCredentials([file(credentialsId: 'grouper-pgp', variable: 'GPG_KEYS')]) {
                 sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS'
@@ -17,7 +18,7 @@ node('docker') {
         stage("Checkout") {
             checkout_result = checkout([
                             $class: 'GitSCM',
-                            branches: [[name: params.branch_or_tag]],
+                            branches: [[name: grouper_src_branch]],
                             extensions: [
                                 [$class: 'LocalBranch'], [$class: 'WipeWorkspace'],
                                 [$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true],
@@ -28,9 +29,9 @@ node('docker') {
         }
 
         stage('Version') {
-            def grouper_version = (params.branch_or_tag =~ tag_pattern)[0][1]
+            def grouper_version = (git_tag =~ tag_pattern)[0][1]
 
-            println "Extracted grouper version '${grouper_version}' from input '${params.branch_or_tag}'"
+            println "Extracted grouper version '${grouper_version}' from input '${git_tag}'"
 
             withMaven(
                 maven: maven_id,