From a71e710aa0f6c6196089216cb9a1ac360c781471 Mon Sep 17 00:00:00 2001 From: Jan Stastny Date: Mon, 21 Oct 2024 16:06:10 +0200 Subject: [PATCH] NO-ISSUE: split maven settings configuration nightly/release (#2686) Co-authored-by: jstastny-cz --- .ci/jenkins/Jenkinsfile.daily-dev-publish | 18 +++++++----------- .ci/jenkins/Jenkinsfile.release-candidate | 2 +- .ci/jenkins/Jenkinsfile.weekly-publish | 18 +++++++----------- .../release-jobs/Jenkinsfile.chrome-extensions | 2 +- .../release-jobs/Jenkinsfile.cors-proxy | 2 +- .../Jenkinsfile.dashbuilder-viewer-image | 2 +- .../Jenkinsfile.dev-deployment-base-image | 2 +- ...nsfile.dev-deployment-dmn-form-webapp-image | 2 +- ...v-deployment-kogito-quarkus-blank-app-image | 2 +- .../Jenkinsfile.dev-deployment-upload-service | 2 +- .../release-jobs/Jenkinsfile.extended-services | 2 +- .../Jenkinsfile.jbpm-quarkus-devui | 18 +++++++----------- .../release-jobs/Jenkinsfile.kie-sandbox | 2 +- .../Jenkinsfile.kie-sandbox-extended-services | 2 +- .../Jenkinsfile.kie-sandbox-helm-chart | 2 +- .../Jenkinsfile.kn-plugin-workflow | 2 +- .../Jenkinsfile.kogito-management-console | 2 +- .../Jenkinsfile.kogito-serverless-operator | 2 +- .../Jenkinsfile.kogito-swf-builder | 2 +- .../Jenkinsfile.kogito-swf-devmode | 2 +- .../Jenkinsfile.kogito-task-console | 2 +- .../release-jobs/Jenkinsfile.npm-packages | 2 +- .../release-jobs/Jenkinsfile.online-editor | 2 +- ...nkinsfile.runtime-tools-consoles-helm-chart | 2 +- .../Jenkinsfile.serverless-logic-web-tools | 2 +- ...rverless-logic-web-tools-base-builder-image | 2 +- ...erverless-logic-web-tools-swf-builder-image | 2 +- ...rverless-logic-web-tools-swf-dev-mode-image | 2 +- .../Jenkinsfile.sonataflow-quarkus-devui | 18 +++++++----------- .../Jenkinsfile.standalone-editors-cdn | 2 +- .../Jenkinsfile.vscode-extensions-dev | 2 +- .../Jenkinsfile.vscode-extensions-prod | 2 +- .ci/jenkins/shared-scripts/pipelineVars.groovy | 5 ++--- 33 files changed, 58 insertions(+), 75 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.daily-dev-publish b/.ci/jenkins/Jenkinsfile.daily-dev-publish index 56fd21e0c92..790abf92d55 100644 --- a/.ci/jenkins/Jenkinsfile.daily-dev-publish +++ b/.ci/jenkins/Jenkinsfile.daily-dev-publish @@ -596,17 +596,13 @@ pipeline { steps { dir('kie-tools') { script { - withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeploySnapshotsCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) { - configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) { - sh """#!/bin/bash -el - export KIE_TOOLS_BUILD__mavenDeploySkip=false - pnpm -F jbpm-quarkus-devui... -F sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config' - pnpm -F jbpm-quarkus-devui... -F sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -Dapache.repository.username=${REPOSITORY_USER} >> .mvn/maven.config' - pnpm -F jbpm-quarkus-devui... -F sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -Dapache.repository.password=${REPOSITORY_TOKEN} >> .mvn/maven.config' - pnpm -F jbpm-quarkus-devui... -F sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -Drevision=999-SNAPSHOT >> .mvn/maven.config' - pnpm -F jbpm-quarkus-devui... -F sonataflow-quarkus-devui... build:prod - """.trim() - } + configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsNightlyConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) { + sh """#!/bin/bash -el + export KIE_TOOLS_BUILD__mavenDeploySkip=false + pnpm -F jbpm-quarkus-devui... -F sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config' + pnpm -F jbpm-quarkus-devui... -F sonataflow-quarkus-devui... exec 'bash' '-c' 'echo -Drevision=999-SNAPSHOT >> .mvn/maven.config' + pnpm -F jbpm-quarkus-devui... -F sonataflow-quarkus-devui... build:prod + """.trim() } } } diff --git a/.ci/jenkins/Jenkinsfile.release-candidate b/.ci/jenkins/Jenkinsfile.release-candidate index d095223c448..ba257ca676c 100644 --- a/.ci/jenkins/Jenkinsfile.release-candidate +++ b/.ci/jenkins/Jenkinsfile.release-candidate @@ -72,7 +72,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/Jenkinsfile.weekly-publish b/.ci/jenkins/Jenkinsfile.weekly-publish index 5dd76e76907..c6da5f6d37f 100644 --- a/.ci/jenkins/Jenkinsfile.weekly-publish +++ b/.ci/jenkins/Jenkinsfile.weekly-publish @@ -115,17 +115,13 @@ pipeline { steps { dir('kie-tools') { script { - withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeploySnapshotsCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) { - configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) { - timestampedSnapshotVersion = getTimestampedSnapshotVersion() - sh """#!/bin/bash -el - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Dapache.repository.username=${REPOSITORY_USER} >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Dapache.repository.password=${REPOSITORY_TOKEN} >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Drevision=${timestampedSnapshotVersion} >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} build:prod - """.trim() - } + configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsNightlyConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) { + timestampedSnapshotVersion = getTimestampedSnapshotVersion() + sh """#!/bin/bash -el + pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config' + pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Drevision=${timestampedSnapshotVersion} >> .mvn/maven.config' + pnpm ${env.PNPM_FILTER_STRING} build:prod + """.trim() } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions index 4680482ec5d..ed2060aaa9a 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions +++ b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions @@ -113,7 +113,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy index 3b10f40fdd4..577a9fd4d0f 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy +++ b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy @@ -115,7 +115,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image b/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image index ac03e1cef08..d397688b29e 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image +++ b/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image @@ -110,7 +110,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image index daf309eb427..8fb80d3b889 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image +++ b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image @@ -110,7 +110,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-dmn-form-webapp-image b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-dmn-form-webapp-image index 111627463a1..5067d560469 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-dmn-form-webapp-image +++ b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-dmn-form-webapp-image @@ -110,7 +110,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image index c4f09261827..5deed41f18f 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image +++ b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image @@ -110,7 +110,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-upload-service b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-upload-service index 707b4962359..e1f15ff8491 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-upload-service +++ b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-upload-service @@ -89,7 +89,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.extended-services b/.ci/jenkins/release-jobs/Jenkinsfile.extended-services index a2975b59730..52bd1bcd2b7 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.extended-services +++ b/.ci/jenkins/release-jobs/Jenkinsfile.extended-services @@ -89,7 +89,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui b/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui index 973cbe0a516..96f84d080fd 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui +++ b/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui @@ -87,7 +87,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } @@ -118,16 +118,12 @@ pipeline { if (params.DRY_RUN) { env.KIE_TOOLS_BUILD__mavenDeploySkip = 'true' } - withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployStagingCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) { - configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) { - sh """#!/bin/bash -el - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Dapache.repository.username=${REPOSITORY_USER} >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Dapache.repository.password=${REPOSITORY_TOKEN} >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Papache-release >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} build:prod - """.trim() - } + configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsReleaseConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) { + sh """#!/bin/bash -el + pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config' + pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Papache-release >> .mvn/maven.config' + pnpm ${env.PNPM_FILTER_STRING} build:prod + """.trim() } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox index 7c9ccb20409..233a0861a56 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox @@ -131,7 +131,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services index 7c435c3ddc6..4b0721279ac 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services @@ -115,7 +115,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart index 817b095902d..7744c6ecca9 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart @@ -111,7 +111,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow b/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow index 4437b7f4d02..a9cc2591e7f 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow @@ -92,7 +92,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console index 37aed0f5416..cac29a9f266 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console @@ -110,7 +110,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator index 2b838ba744f..187b7a5ac19 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator @@ -113,7 +113,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder index bae5d9e6ff0..ce596e477fc 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder @@ -112,7 +112,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode index ab9f1ae97f6..1dd2afb81ea 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode @@ -112,7 +112,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console index 6cf65c9bb86..95fe4f27554 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console @@ -110,7 +110,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages b/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages index 305e92b5db3..77df5549678 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages +++ b/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages @@ -87,7 +87,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor index d02477294fd..1db4ff9f422 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor +++ b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor @@ -123,7 +123,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.runtime-tools-consoles-helm-chart b/.ci/jenkins/release-jobs/Jenkinsfile.runtime-tools-consoles-helm-chart index 136251c4ecc..82e9f803742 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.runtime-tools-consoles-helm-chart +++ b/.ci/jenkins/release-jobs/Jenkinsfile.runtime-tools-consoles-helm-chart @@ -111,7 +111,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools index 5440140cb5d..2893b7dff92 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools +++ b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools @@ -105,7 +105,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } 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 99443bf0dd9..2aa71a9e11b 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 @@ -110,7 +110,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-builder-image b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-builder-image index f2516dbb95a..ed6f44d70ab 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-builder-image +++ b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-builder-image @@ -112,7 +112,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-dev-mode-image b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-dev-mode-image index 28e0d322e9d..29d2fc9cc49 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-dev-mode-image +++ b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-dev-mode-image @@ -110,7 +110,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui b/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui index b8045811acb..f7132541af0 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui +++ b/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui @@ -87,7 +87,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } @@ -118,16 +118,12 @@ pipeline { if (params.DRY_RUN) { env.KIE_TOOLS_BUILD__mavenDeploySkip = 'true' } - withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployStagingCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) { - configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) { - sh """#!/bin/bash -el - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Dapache.repository.username=${REPOSITORY_USER} >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Dapache.repository.password=${REPOSITORY_TOKEN} >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Papache-release >> .mvn/maven.config' - pnpm ${env.PNPM_FILTER_STRING} build:prod - """.trim() - } + configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsReleaseConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) { + sh """#!/bin/bash -el + pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config' + pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -Papache-release >> .mvn/maven.config' + pnpm ${env.PNPM_FILTER_STRING} build:prod + """.trim() } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn b/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn index 082846ce010..68ddb16f12f 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn +++ b/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn @@ -104,7 +104,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev index 057f559a52f..d312f595d48 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev +++ b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev @@ -85,7 +85,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod index 8368bf010e8..4385afa2f05 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod +++ b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod @@ -87,7 +87,7 @@ pipeline { steps { dir('kie-tools') { script { - buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}") + buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}") } } } diff --git a/.ci/jenkins/shared-scripts/pipelineVars.groovy b/.ci/jenkins/shared-scripts/pipelineVars.groovy index 6f87c9f0256..d83f6327b78 100644 --- a/.ci/jenkins/shared-scripts/pipelineVars.groovy +++ b/.ci/jenkins/shared-scripts/pipelineVars.groovy @@ -35,9 +35,8 @@ class PipelineVars implements Serializable { String asfCIGithubCredentialsId = '399061d0-5ab5-4142-a186-a52081fef742' String asfGithubPushCredentialsId = '84811880-2025-45b6-a44c-2f33bef30ad2' String asfGithubTokenPushCredentialsId = '41128c14-bb63-4708-9074-d20a318ee630' - String mavenSettingsConfigFileId = 'kie-release-settings' - String mavenDeploySnapshotsCredentialsId = 'apache-nexus-kie-deploy-credentials' - String mavenDeployStagingCredentialsId = 'jenkins-deploy-to-nexus-staging' + String mavenSettingsReleaseConfigFileId = 'kie-release-authn-settings' + String mavenSettingsNightlyConfigFileId = 'kie-nightly-authn-settings' String defaultArtifactsTempDir = 'artifacts-tmp' String asfReleaseStagingRepository = 'https://dist.apache.org/repos/dist/dev/incubator/kie' String asfReleaseGPGKeyCredentialsId = 'GPG_KEY_FILE'