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 76cc6452825 attempt to fix build for 10.1.0 RC (#3105)
76cc6452825 is described below
commit 76cc64528257d6ea7fdb4f4e22f05d356de7f382
Author: Eduardo Cerqueira <[email protected]>
AuthorDate: Sat May 3 12:27:48 2025 -0400
attempt to fix build for 10.1.0 RC (#3105)
Co-authored-by: Eduardo Cerqueira <[email protected]>
---
.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.npm-packages | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools | 2 +-
.../Jenkinsfile.serverless-logic-web-tools-base-builder-image | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod | 2 +-
.ci/jenkins/shared-scripts/buildUtils.groovy | 8 +++++---
.ci/jenkins/shared-scripts/releaseUtils.groovy | 9 +++------
9 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
b/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
index 9949a41c1a6..56ab28c9e94 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
@@ -98,7 +98,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
- buildUtils.pnpmBootstrap("${env.PNPM_FILTER_STRING}")
+ buildUtils.pnpmBootstrap("${env.PNPM_FILTER_STRING}",
"${env.MAVEN_ARGS}")
}
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
b/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
index c85ee0d5b69..98e31315170 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
@@ -91,7 +91,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
-
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
+
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}",
"${env.MAVEN_ARGS}")
}
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
b/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
index 60ea3dd20c2..1ddc16688a1 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
@@ -112,7 +112,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
-
buildUtils.pnpmBootstrap("${env.PNPM_FILTER_STRING_FOR_BUILDING}")
+
buildUtils.pnpmBootstrap("${env.PNPM_FILTER_STRING_FOR_BUILDING}",
"${env.MAVEN_ARGS}")
}
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
index fc41f68b4e5..96cdedd3ce3 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
@@ -106,7 +106,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
-
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
+
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}",
"${env.MAVEN_ARGS}")
}
}
}
diff --git
a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-base-builder-image
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-base-builder-image
index e68f5f351bf..fb316130e21 100644
---
a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-base-builder-image
+++
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-base-builder-image
@@ -111,7 +111,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
-
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
+
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}",
"${env.MAVEN_ARGS}")
}
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
index bcabe298dee..3e040cb9689 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
@@ -86,7 +86,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
-
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
+
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}",
"${env.MAVEN_ARGS}")
}
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
index 80569b7d2d6..1ebbe5944c8 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
@@ -88,7 +88,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
-
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
+
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}",
"${env.MAVEN_ARGS}")
}
}
}
diff --git a/.ci/jenkins/shared-scripts/buildUtils.groovy
b/.ci/jenkins/shared-scripts/buildUtils.groovy
index 1369ca710b8..81f0dcce578 100644
--- a/.ci/jenkins/shared-scripts/buildUtils.groovy
+++ b/.ci/jenkins/shared-scripts/buildUtils.groovy
@@ -86,9 +86,11 @@ def pnpmBuildFull(Integer workspaceConcurrency = 1) {
* PNPM build a set of packages
*/
def pnpmBuild(String filters, Integer workspaceConcurrency = 1) {
- sh """#!/bin/bash -el
- pnpm ${filters} --workspace-concurrency=${workspaceConcurrency} build:prod
- """.trim()
+ withEnv(["MAVEN_ARGS=${env.MAVEN_ARGS}"]){
+ sh """#!/bin/bash -el
+ pnpm ${filters} --workspace-concurrency=${workspaceConcurrency}
build:prod
+ """.trim()
+ }
}
/**
diff --git a/.ci/jenkins/shared-scripts/releaseUtils.groovy
b/.ci/jenkins/shared-scripts/releaseUtils.groovy
index 4fe6176b1ff..4051e13888a 100644
--- a/.ci/jenkins/shared-scripts/releaseUtils.groovy
+++ b/.ci/jenkins/shared-scripts/releaseUtils.groovy
@@ -77,14 +77,11 @@ def getUpstreamImagesArtifactsList(String artifactsDir,
String releaseVersion) {
"kogito-jobs-service-postgresql"
]
- def isRC = releaseVersion.toLowerCase().contains("rc")
+ // clean -rc suffix if present
+ def versionClean = releaseVersion.replaceAll(/(?i)-rc\d*/, '')
return components.collect { component ->
- if (isRC) {
- return "${artifactsDir}/incubator-kie-${component}-image.tar.gz"
- } else {
- return
"${artifactsDir}/incubator-kie-${releaseVersion}-${component}-image.tar.gz"
- }
+
"${artifactsDir}/incubator-kie-${versionClean}-${component}-image.tar.gz"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
