This is an automated email from the ASF dual-hosted git repository. eduardocerqueira pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
commit d60411119a7c28935b5b14c88939094a023ad60e Author: Eduardo Cerqueira <[email protected]> AuthorDate: Thu May 15 14:36:26 2025 -0400 Jenkins Pipeline - buildUtils: Applied standard passing MAVEN_ARGS as function parameter - updated cors-proxy to use the new function parameter as standard --- .ci/jenkins/release-jobs/Jenkinsfile.cors-proxy | 2 +- .ci/jenkins/shared-scripts/buildUtils.groovy | 63 +++++++++++++------------ 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy index a3c411dc0fa..c9ef8b62f20 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy +++ b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy @@ -138,7 +138,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.pnpmBuild("${env.PNPM_FILTER_STRING}") + buildUtils.pnpmBuild(env.PNPM_FILTER_STRING, env.MAVEN_ARGS) } } } diff --git a/.ci/jenkins/shared-scripts/buildUtils.groovy b/.ci/jenkins/shared-scripts/buildUtils.groovy index f40969da47a..9c35e820f9a 100644 --- a/.ci/jenkins/shared-scripts/buildUtils.groovy +++ b/.ci/jenkins/shared-scripts/buildUtils.groovy @@ -19,7 +19,8 @@ * Start Docker in Docker (DinD) */ def startDockerInDocker() { - sh '''#!/bin/bash -el + sh ''' + #!/bin/bash -el sudo entrypoint.sh sudo service dbus start '''.trim() @@ -29,7 +30,8 @@ def startDockerInDocker() { * Start Xvfb X server required for KIE-Tools E2E tests */ def startXvfb() { - sh '''#!/bin/bash -el + sh ''' + #!/bin/bash -el Xvfb :99 -screen 0 1920x1080x24 > /dev/null 2>&1 & '''.trim() } @@ -38,7 +40,8 @@ def startXvfb() { * Start Fluxbox window manager required for KIE-Tools E2E tests */ def startFluxbox() { - sh '''#!/bin/bash -el + sh ''' + #!/bin/bash -el fluxbox -display :99 > /dev/null 2>&1 & '''.trim() } @@ -47,7 +50,8 @@ def startFluxbox() { * Setup PNPM parameters for building KIE-Tools */ def setupPnpm(String mavenSettingsFileId = '') { - sh """#!/bin/bash -el + 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' @@ -56,7 +60,8 @@ def setupPnpm(String mavenSettingsFileId = '') { if (mavenSettingsFileId) { configFileProvider([configFile(fileId: mavenSettingsFileId, variable: 'MAVEN_SETTINGS_FILE')]) { - sh """#!/bin/bash -el + 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' """.trim() @@ -79,7 +84,8 @@ def pnpmBootstrap(String filters = '', String mavenArgs = '') { * PNPM build all packages */ def pnpmBuildFull(Integer workspaceConcurrency = 1) { - sh """#!/bin/bash -el + sh """ + #!/bin/bash -el pnpm -r --workspace-concurrency=${workspaceConcurrency} build:prod """.trim() } @@ -87,46 +93,45 @@ def pnpmBuildFull(Integer workspaceConcurrency = 1) { /** * PNPM build a set of packages */ -def pnpmBuild(String filters, Integer workspaceConcurrency = 1) { - withEnv(["MAVEN_ARGS=${env.MAVEN_ARGS}"]){ - sh """#!/bin/bash -el - export MAVEN_ARGS=${env.MAVEN_ARGS} - pnpm ${filters} --workspace-concurrency=${workspaceConcurrency} build:prod - """.trim() - } +def pnpmBuild(String filters, String mavenArgs = '') { + sh """ + #!/bin/bash -el + export MAVEN_ARGS="${mavenArgs}" + pnpm ${filters} --workspace-concurrency=1 build:prod + """.trim() } /** * PNPM update project version to */ -def pnpmUpdateProjectVersion(String projectVersion) { - withEnv(["MAVEN_ARGS=${env.MAVEN_ARGS}"]){ - sh """#!/bin/bash -el - pnpm update-version-to ${projectVersion} - """.trim() - } +def pnpmUpdateProjectVersion(String projectVersion, String mavenArgs = '') { + sh """ + #!/bin/bash -el + export MAVEN_ARGS="${mavenArgs}" + 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 +def pnpmUpdateKogitoVersion(String kogitoVersion, String imagesTag, String mavenArgs = '') { + sh """ + #!/bin/bash -el + export MAVEN_ARGS="${mavenArgs}" pnpm update-kogito-version-to --maven ${kogitoVersion} """.trim() - } } /** * PNPM update stream name to */ -def pnpmUpdateStreamName(String streamName) { - withEnv(["MAVEN_ARGS=${env.MAVEN_ARGS}"]){ - sh """#!/bin/bash -el - pnpm update-stream-name-to ${streamName} - """.trim() - } +def pnpmUpdateStreamName(String streamName, String mavenArgs = '') { + sh """ + #!/bin/bash -el + export MAVEN_ARGS="${mavenArgs}" + pnpm update-stream-name-to ${streamName} + """.trim() } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
