From 8c66710cb8c5991a04c0022d85457b584d3a138f Mon Sep 17 00:00:00 2001 From: jstastny-cz Date: Thu, 16 May 2024 17:44:26 +0200 Subject: [PATCH] kie-issues#1237: stay on x.y.999-SNAPSHOT in release branches --- .ci/jenkins/Jenkinsfile.release | 13 ------------- .ci/jenkins/Jenkinsfile.setup-branch | 4 ++-- .ci/jenkins/Jenkinsfile.setup-branch.cloud | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.release b/.ci/jenkins/Jenkinsfile.release index 85ffd2f9d..a9dcf65b8 100644 --- a/.ci/jenkins/Jenkinsfile.release +++ b/.ci/jenkins/Jenkinsfile.release @@ -172,19 +172,6 @@ pipeline { } } - stage('Setup next snapshot version') { - steps { - script { - def buildParams = [] - addStringParam(buildParams, 'KOGITO_VERSION', util.getNextVersion(getKogitoVersion(), 'micro')) - addStringParam(buildParams, 'DROOLS_VERSION', util.getNextVersion(getDroolsVersion(), 'micro')) - addBooleanParam(buildParams, 'SKIP_CLOUD_SETUP_BRANCH', true) - - build(job: '../setup-branch/0-setup-branch', wait: false, parameters: buildParams, propagate: false) - } - } - } - stage('Start Cloud release') { when { expression { isCloudRelease() } diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch index 0ade29d09..f0936f921 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch +++ b/.ci/jenkins/Jenkinsfile.setup-branch @@ -240,14 +240,14 @@ String getGitAuthorPushCredsId() { } String getDroolsVersion() { - return params.DROOLS_VERSION ?: getVersionFromReleaseBranch(util.calculateTargetReleaseBranch(getBuildBranch(), 7)) + return params.DROOLS_VERSION ?: getVersionFromReleaseBranch(getBuildBranch()) } String getKogitoVersion() { return params.KOGITO_VERSION ?: getVersionFromReleaseBranch(getBuildBranch()) } -String getVersionFromReleaseBranch(String releaseBranch, int microVersion = 0, String suffix = 'SNAPSHOT') { +String getVersionFromReleaseBranch(String releaseBranch, int microVersion = 999, String suffix = 'SNAPSHOT') { String [] versionSplit = releaseBranch.split("\\.") if (versionSplit.length == 3 && versionSplit[0].isNumber() diff --git a/.ci/jenkins/Jenkinsfile.setup-branch.cloud b/.ci/jenkins/Jenkinsfile.setup-branch.cloud index aefad5e75..7a0dde99c 100644 --- a/.ci/jenkins/Jenkinsfile.setup-branch.cloud +++ b/.ci/jenkins/Jenkinsfile.setup-branch.cloud @@ -172,7 +172,7 @@ String getKogitoVersion() { return params.KOGITO_VERSION ?: getVersionFromReleaseBranch(getBuildBranch()) } -String getVersionFromReleaseBranch(String releaseBranch, int microVersion = 0, String suffix = 'SNAPSHOT') { +String getVersionFromReleaseBranch(String releaseBranch, int microVersion = 999, String suffix = 'SNAPSHOT') { String [] versionSplit = releaseBranch.split("\\.") if (versionSplit.length == 3 && versionSplit[0].isNumber()