fixed setting git ref for branch with slashes in name (#4554)

Co-authored-by: sumeet patil <[email protected]>
SAP · Sep 12, 2023 · 1704758 · 1704758
1 parent 1aac091
commit 1704758
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/test/groovy/SetupCommonPipelineEnvironmentTest.groovy b/test/groovy/SetupCommonPipelineEnvironmentTest.groovy
@@ -336,6 +336,44 @@ class SetupCommonPipelineEnvironmentTest extends BasePiperTest {
         assertThat(nullScript.commonPipelineEnvironment.gitRef, is('refs/heads/testbranch'))
     }
 
+    @Test
+    void "Set scmInfo parameter sets git reference for branch with slashes in name, origin"() {
+
+        def GitUtils gitUtils = new GitUtils() {
+            boolean isMergeCommit(){
+                return false
+            }
+        }
+
+        helper.registerAllowedMethod("fileExists", [String], { String path ->
+            return path.endsWith('.pipeline/config.yml')
+        })
+
+        def dummyScmInfo = [GIT_COMMIT: 'dummy_git_commit_id', GIT_BRANCH: 'origin/testbranch/001']
+
+        stepRule.step.setupCommonPipelineEnvironment(script: nullScript, utils: utilsMock, scmInfo: dummyScmInfo, gitUtils: gitUtils)
+        assertThat(nullScript.commonPipelineEnvironment.gitRef, is('refs/heads/testbranch/001'))
+    }
+
+    @Test
+    void "Set scmInfo parameter sets git reference for branch with slashes in name, not origin"() {
+
+        def GitUtils gitUtils = new GitUtils() {
+            boolean isMergeCommit(){
+                return false
+            }
+        }
+
+        helper.registerAllowedMethod("fileExists", [String], { String path ->
+            return path.endsWith('.pipeline/config.yml')
+        })
+
+        def dummyScmInfo = [GIT_COMMIT: 'dummy_git_commit_id', GIT_BRANCH: 'testbranch/001']
+
+        stepRule.step.setupCommonPipelineEnvironment(script: nullScript, utils: utilsMock, scmInfo: dummyScmInfo, gitUtils: gitUtils)
+        assertThat(nullScript.commonPipelineEnvironment.gitRef, is('refs/heads/testbranch/001'))
+    }
+
     @Test
     void "sets gitReference and gitRemoteCommit for pull request, head strategy"() {
 

diff --git a/vars/setupCommonPipelineEnvironment.groovy b/vars/setupCommonPipelineEnvironment.groovy
@@ -271,7 +271,10 @@ private void setGitRefOnCommonPipelineEnvironment(script, String gitCommit, Stri
     }
 
     if(gitBranch.contains("/")){
-        gitBranch = gitBranch.split("/")[1]
+        gitBranchSplit = gitBranch.split("/")
+        if(gitBranchSplit[0] == "origin") {
+            gitBranch = gitBranchSplit[1..-1].join("/")
+        }
     }
 
     if (!gitBranch.contains("PR")) {