From d252924f221f566626b2dea7af08e7e745d35a5f Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Mon, 19 Jun 2023 16:44:24 +0200
Subject: [PATCH] fix(kube): replace special caracters in branch name again

---
 vars/kubecontainer.groovy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vars/kubecontainer.groovy b/vars/kubecontainer.groovy
index 53a9326..ce2ae97 100644
--- a/vars/kubecontainer.groovy
+++ b/vars/kubecontainer.groovy
@@ -24,6 +24,7 @@ String buildAndPublishImage(Map options = [:]) {
     String dockerRepositoryCredentialsId = options.get('dockerRepositoryCredentialsId', 'reg.cadoles.com-jenkins')
     Boolean dryRun = options.get('dryRun', true)
     Boolean skipVerifications = options.get('skipVerification', false)
+    String currentBranch = env.BRANCH_NAME.replaceAll("[^a-zA-Z]+","_")
 
     String projectRepository = env.JOB_NAME
     if (env.BRANCH_NAME ==~ /^PR-.*$/) {
@@ -47,7 +48,7 @@ String buildAndPublishImage(Map options = [:]) {
         stage("Build image '${imageName}:${imageTag}'") {
             git.withHTTPCredentials(gitCredentialsId) {
                 sh """
-                CURRENT_BRANCH=$( echo ${BRANCH_NAME} | | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]') make 
+                CURRENT_BRANCH=${currentBranch} make 
                 """
             }
         }
@@ -62,7 +63,7 @@ String buildAndPublishImage(Map options = [:]) {
             utils.when(!dryRun) {
                 retry(2) {
                     sh """
-                	CURRENT_BRANCH=$( echo ${BRANCH_NAME} | | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]') make 
+                	CURRENT_BRANCH=${currentBranch} make release
                     """
                 }
             }