This is an automated email from the ASF dual-hosted git repository.
jstastnycz pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-pipelines.git
The following commit(s) were added to refs/heads/main by this push:
new 111bfb33 kie-issues#1237: stay on x.y.999-SNAPSHOT in release branches
(#1201)
111bfb33 is described below
commit 111bfb33d6c4e41cf8111f250ba60e04fd856430
Author: Jan Stastny <[email protected]>
AuthorDate: Wed May 22 17:37:31 2024 +0200
kie-issues#1237: stay on x.y.999-SNAPSHOT in release branches (#1201)
Co-authored-by: jstastny-cz <[email protected]>
---
.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 85ffd2f9..a9dcf65b 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 a9e57d7b..97d7d54a 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -255,14 +255,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 04e47c39..a198a890 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch.cloud
+++ b/.ci/jenkins/Jenkinsfile.setup-branch.cloud
@@ -186,7 +186,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()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
