Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into no-issue-vscode-exten…
Browse files Browse the repository at this point in the history
…sion-tester-b
  • Loading branch information
ljmotta committed Oct 28, 2024
2 parents 9dc0ac6 + cda60cf commit 234af51
Show file tree
Hide file tree
Showing 264 changed files with 4,418 additions and 8,435 deletions.
2 changes: 2 additions & 0 deletions .ci/incubator-kie-tools-ci-build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ libglvnd0 \
libbtrfs-dev \
libgpgme-dev \
libdevmapper-dev \
libxml2-utils \
python3 \
python3-pip \
python3-dev \
Expand All @@ -43,6 +44,7 @@ unzip \
bzip2 \
xvfb \
fluxbox \
rsync \
subversion && \
apt-get clean autoclean && apt-get autoremove --yes && \
rm -rf /var/lib/{apt,cache,log}/
Expand Down
18 changes: 7 additions & 11 deletions .ci/jenkins/Jenkinsfile.daily-dev-publish
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/Jenkinsfile.release-candidate
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
18 changes: 7 additions & 11 deletions .ci/jenkins/Jenkinsfile.weekly-publish
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pipeline {
dir('kie-tools') {
sh '''#!/bin/bash -el
pnpm bootstrap:root
npx --yes syncpack@6.2.0 list-mismatches
npx --yes syncpack@13.0.0 list-mismatches
'''.trim()
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.extended-services
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
18 changes: 7 additions & 11 deletions .ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down Expand Up @@ -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()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.npm-packages
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.online-editor
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
18 changes: 7 additions & 11 deletions .ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down Expand Up @@ -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()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
1 change: 0 additions & 1 deletion .ci/jenkins/shared-scripts/buildUtils.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def setupPnpm(String mavenSettingsFileId = '') {
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 -ntp >> .mvn/maven.config'
pnpm -r exec 'bash' '-c' 'echo -Xmx2g > .mvn/jvm.config'
""".trim()

Expand Down
Loading

0 comments on commit 234af51

Please sign in to comment.