From 426f7974cb86f6edb320da9f33e8df298a5f44e4 Mon Sep 17 00:00:00 2001 From: radtriste Date: Tue, 5 Sep 2023 13:54:26 +0200 Subject: [PATCH] Kogito 2: Fix setup-branch --- .ci/jenkins/Jenkinsfile.setup-branch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index cd383415c75..174f684f3b7 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch +++ b/.ci/jenkins/Jenkinsfile.setup-branch @@ -119,7 +119,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() {