From da3c1c0ef7999562fbbcd81e0fff6c2ef632165e Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Tue, 25 Oct 2022 09:01:08 -0400 Subject: [PATCH] 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 (cherry picked from commit 54b4d430ae9f77cef482da7f2e7865e5ea498324) --- jenkins/ci-pipelines/ci_stage_2.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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( -- 2.25.1