From efbdad226cfc140c48f0d2d5ae03e898408a759f Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Wed, 23 Aug 2023 15:16:33 -0600
Subject: [PATCH] feat(standard-make): add staging and master to default
 release branches

---
 vars/standardMakePipeline.groovy | 2 +-
 vars/utils.groovy                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/vars/standardMakePipeline.groovy b/vars/standardMakePipeline.groovy
index 3a277dc..308f959 100644
--- a/vars/standardMakePipeline.groovy
+++ b/vars/standardMakePipeline.groovy
@@ -27,7 +27,7 @@ void call(Map options = [:]) {
     String dockerfileExtension = options.get('dockerfileExtension', '')
     List credentials = options.get('credentials', [])
 
-    List<String> releaseBranches = options.get('releaseBranches', ['develop', 'testing', 'stable'])
+    List<String> releaseBranches = options.get('releaseBranches', ['develop', 'testing', 'stable', 'staging', 'master'])
 
     node {
         properties([
diff --git a/vars/utils.groovy b/vars/utils.groovy
index 940050d..cda5130 100644
--- a/vars/utils.groovy
+++ b/vars/utils.groovy
@@ -52,8 +52,10 @@ String getProjectVersionShortChannel(String channel) {
         case 'develop':
             return 'dev'
         case 'testing':
+        case 'staging':
             return 'tst'
         case 'stable':
+        case 'master':
             return 'stb'
         default:
             return channel.toLowerCase().replaceAll('(a|e|i|o|u|y_|-| )+', '').take(3)