Kogito 2: Fix setup-branch (#1783)

apache · Sep 5, 2023 · ac1ef04 · ac1ef04
1 parent 3b5dc27
commit ac1ef04
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -173,7 +173,15 @@ void checkoutRepo(String repository, String branch) {
 }
 
 String getDroolsTargetBranch() {
-    return util.calculateTargetReleaseBranch(getBuildBranch(), 7)
+    String targetBranch = getBuildBranch()
+    List versionSplit = targetBranch.split("\\.") as List
+
+    if (versionSplit[0].isNumber()) {
+        targetBranch = "${Integer.parseInt(versionSplit[0]) + 7}.${versionSplit.tail().join('.')}"
+    } else {
+        echo "Cannot parse targetBranch as release branch so going further with current value: ${targetBranch}"
+    }
+    return targetBranch
 }
 
 String getRepoName() {