Fixing branch in charm build 15/12815/1
authorMark Beierl <mark.beierl@canonical.com>
Tue, 25 Oct 2022 13:01:08 +0000 (09:01 -0400)
committerbeierlm <mark.beierl@canonical.com>
Fri, 6 Jan 2023 16:39:49 +0000 (17:39 +0100)
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)

jenkins/ci-pipelines/ci_stage_2.groovy

index e4b63d4..44e6ae9 100644 (file)
@@ -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(