You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ra...@apache.org on 2024/01/19 11:23:24 UTC
(incubator-kie-kogito-runtimes) branch kie-issues_821 updated: Weekly job fixes
This is an automated email from the ASF dual-hosted git repository.
rantunes pushed a commit to branch kie-issues_821
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/kie-issues_821 by this push:
new b2f7bc8de3 Weekly job fixes
b2f7bc8de3 is described below
commit b2f7bc8de3bab2e92afb02985031cfc44e7c2544
Author: Rodrigo Antunes <co...@rodrigoantunes.com.br>
AuthorDate: Fri Jan 19 08:23:14 2024 -0300
Weekly job fixes
---
.ci/jenkins/Jenkinsfile.weekly.deploy | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.weekly.deploy b/.ci/jenkins/Jenkinsfile.weekly.deploy
index 70eccf4c5a..3a933c78c6 100644
--- a/.ci/jenkins/Jenkinsfile.weekly.deploy
+++ b/.ci/jenkins/Jenkinsfile.weekly.deploy
@@ -44,6 +44,8 @@ pipeline {
dir(getRepoName()) {
checkoutRepo()
}
+
+ env.PROJECT_VERSION = maven.mvnGetVersionProperty(getMavenCommand(), 'project.version')
}
}
post {
@@ -73,7 +75,7 @@ pipeline {
maven.mvnSetVersionProperty(
getMavenCommand(),
'version.org.kie',
- getProjectVersion()
+ getDroolsVersion()
)
}
}
@@ -103,7 +105,7 @@ pipeline {
script {
withCredentials([usernamePassword(credentialsId: env.MAVEN_REPO_CREDS_ID, usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
- new getMavenCommand()
+ getMavenCommand()
.withSettingsXmlFile(MAVEN_SETTINGS_FILE)
.withProperty('wagon.source', "file://${getLocalDeploymentFolder()}")
.withProperty('wagon.target', env.MAVEN_DEPLOY_REPOSITORY)
@@ -238,14 +240,18 @@ String getCheckoutDatetime() {
}
String getProjectVersionDate() {
- date = (getCheckoutDatetime() =~ /(\d{4}-\d{2}-\d{2})/)[0][0]
- return date.replace('-', '')
+ def projectVersionDate = (getCheckoutDatetime() =~ /(\d{4}-\d{2}-\d{2})/)[0][0]
+ return projectVersionDate.replace('-', '')
}
String getProjectVersion(boolean keepSnapshotSuffix = true) {
- version = maven.mvnGetVersionProperty(getMavenCommand(), 'project.version')
+ def projectVersion = env.PROJECT_VERSION
if (keepSnapshotSuffix) {
- return version.replace("-SNAPSHOT", "-${getProjectVersionDate()}-SNAPSHOT")
+ return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}-SNAPSHOT")
}
- return version.replace("-SNAPSHOT", "-${getProjectVersionDate()}")
+ return projectVersion.replace("-SNAPSHOT", "-${getProjectVersionDate()}")
+}
+
+String getDroolsVersion() {
+ return getProjectVersion()
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org