This is an automated email from the ASF dual-hosted git repository.
porcelli pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 9631d284a3c Setting MAVEN_ARGS as environment variable (#3101)
9631d284a3c is described below
commit 9631d284a3c94ea35365833d3f2162a91a91887f
Author: Eduardo Cerqueira <[email protected]>
AuthorDate: Fri May 2 20:48:53 2025 -0400
Setting MAVEN_ARGS as environment variable (#3101)
Co-authored-by: Eduardo Cerqueira <[email protected]>
---
.ci/jenkins/Jenkinsfile.release-candidate | 4 ++++
.ci/jenkins/shared-scripts/buildUtils.groovy | 21 +++++++++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.release-candidate
b/.ci/jenkins/Jenkinsfile.release-candidate
index 3e0a616913e..6dad719e3c6 100644
--- a/.ci/jenkins/Jenkinsfile.release-candidate
+++ b/.ci/jenkins/Jenkinsfile.release-candidate
@@ -30,6 +30,10 @@ pipeline {
timeout(time: 180, unit: 'MINUTES')
}
+ environment {
+ MAVEN_ARGS = "-B -s ${WORKSPACE}/kie-settings.xml"
+ }
+
parameters {
string(name: 'BRANCH_NAME', description: 'Set the Git branch to
checkout (0.0.x)', trim: true)
string(name: 'RELEASE_VERSION', description: 'Release version', trim:
true)
diff --git a/.ci/jenkins/shared-scripts/buildUtils.groovy
b/.ci/jenkins/shared-scripts/buildUtils.groovy
index b1d29202924..1369ca710b8 100644
--- a/.ci/jenkins/shared-scripts/buildUtils.groovy
+++ b/.ci/jenkins/shared-scripts/buildUtils.groovy
@@ -50,7 +50,6 @@ def setupPnpm(String mavenSettingsFileId = '') {
sh """#!/bin/bash -el
pnpm config set network-timeout 1000000
pnpm -r exec 'bash' '-c' 'mkdir .mvn'
- pnpm -r exec 'bash' '-c' 'echo -B > .mvn/maven.config'
pnpm -r exec 'bash' '-c' 'echo -Xmx2g > .mvn/jvm.config'
""".trim()
@@ -58,7 +57,7 @@ def setupPnpm(String mavenSettingsFileId = '') {
configFileProvider([configFile(fileId: mavenSettingsFileId, variable:
'MAVEN_SETTINGS_FILE')]) {
sh """#!/bin/bash -el
cp ${MAVEN_SETTINGS_FILE} ${WORKSPACE}/kie-settings.xml
- pnpm -r exec 'bash' '-c' 'echo
--settings=${WORKSPACE}/kie-settings.xml >> .mvn/maven.config'
+ export MAVEN_ARGS="-s ${WORKSPACE}/kie-settings.xml"
""".trim()
}
}
@@ -96,27 +95,33 @@ def pnpmBuild(String filters, Integer workspaceConcurrency
= 1) {
* PNPM update project version to
*/
def pnpmUpdateProjectVersion(String projectVersion) {
- sh """#!/bin/bash -el
- pnpm update-version-to ${projectVersion}
- """.trim()
+ withEnv(["MAVEN_ARGS=${env.MAVEN_ARGS}"]){
+ sh """#!/bin/bash -el
+ pnpm update-version-to ${projectVersion}
+ """.trim()
+ }
}
/**
* PNPM update kogito version to
*/
def pnpmUpdateKogitoVersion(String kogitoVersion, String imagesTag) {
+ withEnv(["MAVEN_ARGS=${env.MAVEN_ARGS}"]){
sh """#!/bin/bash -el
pnpm update-kogito-version-to --maven ${kogitoVersion}
""".trim()
+ }
}
/**
* PNPM update stream name to
*/
def pnpmUpdateStreamName(String streamName) {
- sh """#!/bin/bash -el
- pnpm update-stream-name-to ${streamName}
- """.trim()
+ withEnv(["MAVEN_ARGS=${env.MAVEN_ARGS}"]){
+ sh """#!/bin/bash -el
+ pnpm update-stream-name-to ${streamName}
+ """.trim()
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
