From: Mark Beierl <mark.beierl@canonical.com>
Date: Tue, 25 Oct 2022 13:01:08 +0000 (-0400)
Subject: Fixing branch in charm build
X-Git-Tag: release-v14.0-start~121
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=da3c1c0ef7999562fbbcd81e0fff6c2ef632165e;p=osm%2Fdevops.git

Fixing branch in charm build

First time testing with a non-production branch, need to use the branch
name in the final charm revision

Change-Id: I95f72d04c498310fd03eebc22b59fd2cc8aa6d46
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
(cherry picked from commit 54b4d430ae9f77cef482da7f2e7865e5ea498324)
---

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index e4b63d41..44e6ae9a 100644
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@ -202,7 +202,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,do_stage_3,artifa
                                     if (BRANCH_NAME.startsWith("v")) {
                                         channel=BRANCH_NAME.substring(1)
                                     } else if (BRANCH_NAME!="master") {
-                                        REV="/"+BRANCH_NAME+REV.replaceAll('/','-')
+                                        charmBranch=BRANCH_NAME
                                     }
 
                                     def charmName = sh(