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-apps.git
commit c7b7ae6640cf3b91ee592b921e532f80311afa88 Author: Rodrigo Antunes <[email protected]> AuthorDate: Fri Jan 19 08:21:21 2024 -0300 Weekly job fixes --- .ci/jenkins/Jenkinsfile.deploy | 2 +- .ci/jenkins/Jenkinsfile.weekly-deploy | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index f6bb09df3..68cde8f68 100644 --- a/.ci/jenkins/Jenkinsfile.deploy +++ b/.ci/jenkins/Jenkinsfile.deploy @@ -16,7 +16,7 @@ pipeline { options { timestamps() - timeout(time: 210, unit: 'MINUTES') + timeout(time: 600, unit: 'MINUTES') } // parameters { diff --git a/.ci/jenkins/Jenkinsfile.weekly-deploy b/.ci/jenkins/Jenkinsfile.weekly-deploy index d2e7b022d..f6fb0c709 100644 --- a/.ci/jenkins/Jenkinsfile.weekly-deploy +++ b/.ci/jenkins/Jenkinsfile.weekly-deploy @@ -16,7 +16,7 @@ pipeline { options { timestamps() - timeout(time: 210, unit: 'MINUTES') + timeout(time: 600, unit: 'MINUTES') } // parameters { @@ -44,6 +44,8 @@ pipeline { dir(getRepoName()) { checkoutRepo() } + + env.PROJECT_VERSION = maven.mvnGetVersionProperty(getMavenCommand(), 'project.parent.version') } } post { @@ -228,14 +230,14 @@ 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.parent.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()}") } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
