Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into kie-issues-1542
Browse files Browse the repository at this point in the history
  • Loading branch information
ljmotta committed Dec 20, 2024
2 parents 53363e3 + bc20d5d commit fdf929d
Show file tree
Hide file tree
Showing 1,399 changed files with 48,675 additions and 90,109 deletions.
2 changes: 1 addition & 1 deletion .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
github:
enabled_merge_buttons:
squash: true
merge: true
merge: false
rebase: false
6 changes: 4 additions & 2 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 Expand Up @@ -98,8 +100,8 @@ RUN curl -s "https://get.sdkman.io" | bash && \
sdk flush

# Golang setup
RUN wget https://go.dev/dl/go1.21.9.linux-amd64.tar.gz -P /tmp && \
sudo tar xzf /tmp/go1.21.9.linux-amd64.tar.gz -C /opt && rm /tmp/go1.21.9.linux-amd64.tar.gz && \
RUN wget https://go.dev/dl/go1.22.9.linux-amd64.tar.gz -P /tmp && \
sudo tar xzf /tmp/go1.22.9.linux-amd64.tar.gz -C /opt && rm /tmp/go1.22.9.linux-amd64.tar.gz && \
echo 'export GOPATH=${HOME}/go' | sudo tee /etc/profile.d/go.sh && \
echo 'export PATH=${PATH}:/opt/go/bin:${GOPATH}/bin' | sudo tee -a /etc/profile.d/go.sh && \
echo "source /etc/profile.d/go.sh" >> $HOME/.bashrc && \
Expand Down
38 changes: 27 additions & 11 deletions .ci/jenkins/Jenkinsfile.daily-dev-publish
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ pipeline {
SONATAFLOW_DEVMODE_IMAGE__name = 'incubator-kie-sonataflow-devmode'
SONATAFLOW_DEVMODE_IMAGE__buildTag = "${params.BRANCH_NAME}"

SONATAFLOW_MANAGEMENT_CONSOLE__registry = 'docker.io'
SONATAFLOW_MANAGEMENT_CONSOLE__account = 'apache'
SONATAFLOW_MANAGEMENT_CONSOLE__name = 'incubator-kie-sonataflow-management-console'
SONATAFLOW_MANAGEMENT_CONSOLE__buildTag = "${params.BRANCH_NAME}"

SONATAFLOW_OPERATOR__registry = 'docker.io'
SONATAFLOW_OPERATOR__account = 'apache'
SONATAFLOW_OPERATOR__name = 'incubator-kie-sonataflow-operator'
Expand Down Expand Up @@ -273,6 +278,21 @@ pipeline {
}
}

stage('Push sonataflow-management-console to Docker Hub') {
steps {
script {
dockerUtils.pushImageToRegistry(
"${env.SONATAFLOW_MANAGEMENT_CONSOLE__registry}",
"${env.SONATAFLOW_MANAGEMENT_CONSOLE__account}",
"${env.SONATAFLOW_MANAGEMENT_CONSOLE__name}",
"${env.SONATAFLOW_MANAGEMENT_CONSOLE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
"${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
}

stage('Push sonataflow-operator to Docker Hub') {
steps {
script {
Expand Down Expand Up @@ -596,17 +616,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
49 changes: 26 additions & 23 deletions .ci/jenkins/Jenkinsfile.release-build
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,17 @@ pipeline {

stage('Parallel - Builds') {
parallel {
stage('KIE Sandbox Accelerator Quarkus') {
when {
expression { env.KIE_SANDBOX_ACCELERATOR_QUARKUS == 'true' }
}
steps {
script {
kieSandboxAcceleratorQuarkusBuildJob()
}
}
}

stage('Dev Deployment Kogito Quarkus Blank App Image') {
when {
expression { env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE == 'true' }
Expand Down Expand Up @@ -209,17 +220,6 @@ pipeline {
}
}

stage('Kogito Task Console Image') {
when {
expression { env.KOGITO_TASK_CONSOLE == 'true' }
}
steps {
script {
kogitoTaskConsoleBuildJob()
}
}
}

stage('Kogito Management Console Image') {
when {
expression { env.KOGITO_MANAGEMENT_CONSOLE == 'true' }
Expand Down Expand Up @@ -427,6 +427,7 @@ pipeline {

def setRunners() {
runners = readJSON text: "${params.RUNNERS}"
env.KIE_SANDBOX_ACCELERATOR_QUARKUS = runners.kie_sandbox_accelerator_quarkus
env.DEV_DEPLOYMENT_BASE_IMAGE = runners.dev_deployment_base_image
env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE = runners.dev_deployment_kogito_quakus_blank_app_image
env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE = runners.dev_deployment_dmn_form_webapp_image
Expand Down Expand Up @@ -460,6 +461,7 @@ def setRunners() {

def printRunners() {
sh """
echo "kie_sandbox_accelerator_quarkus: ${env.KIE_SANDBOX_ACCELERATOR_QUARKUS}"
echo "dev_deployment_base_image: ${env.DEV_DEPLOYMENT_BASE_IMAGE}"
echo "dev_deployment_kogito_quakus_blank_app_image: ${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE}"
echo "dev_deployment_dmn_form_webapp_image: ${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE}"
Expand Down Expand Up @@ -627,18 +629,6 @@ def serverlessLogicWebToolsBuildJob() {
).result
}

def kogitoTaskConsoleBuildJob() {
env.KOGITO_TASK_CONSOLE_JOB_RESULT = build(
job: 'KIE/kie-tools/kie-tools-release-jobs/kogito-task-console',
parameters: [
booleanParam(name: 'DRY_RUN', value: "${params.DRY_RUN}"),
string(name: 'BASE_REF', value: "${params.BASE_REF}"),
string(name: 'RELEASE_VERSION', value: "${params.RELEASE_VERSION}"),
string(name: 'RELEASE_CANDIDATE_VERSION', value: "${params.RELEASE_CANDIDATE_VERSION}")
]
).result
}

def kogitoManagementConsoleBuildJob() {
env.KOGITO_MANAGEMENT_CONSOLE_JOB_RESULT = build(
job: 'KIE/kie-tools/kie-tools-release-jobs/kogito-management-console',
Expand Down Expand Up @@ -824,6 +814,19 @@ def kieSandboxImageBuildJob() {
env.KIE_SANDBOX_URL = openShiftUtils.getAppRoute("${env.OPENSHIFT_NAMESPACE}", 'kie-sandbox', "${pipelineVars.openshiftCredentialsId}")
}

def kieSandboxAcceleratorQuarkusBuildJob() {
env.KIE_SANDBOX_IMAGE_JOB_RESULT = build(
job: 'KIE/kie-tools/kie-tools-release-jobs/kie-sandbox-accelerator-quarkus',
parameters: [
booleanParam(name: 'DRY_RUN', value: "${params.DRY_RUN}"),
string(name: 'BASE_REF', value: "${params.BASE_REF}"),
string(name: 'RELEASE_VERSION', value: "${params.RELEASE_VERSION}"),
string(name: 'RELEASE_CANDIDATE_VERSION', value: "${params.RELEASE_CANDIDATE_VERSION}")
]
).result
env.KIE_SANDBOX_URL = openShiftUtils.getAppRoute("${env.OPENSHIFT_NAMESPACE}", 'kie-sandbox', "${pipelineVars.openshiftCredentialsId}")
}

def kieSandboxHelmChartBuildJob() {
env.KIE_SANDBOX_HELM_CHART_JOB_RESULT = build(
job: 'KIE/kie-tools/kie-tools-release-jobs/kie-sandbox-helm-chart',
Expand Down
4 changes: 2 additions & 2 deletions .ci/jenkins/Jenkinsfile.release-candidate
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pipeline {
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)
string(name: 'TAG_NAME', description: 'Tag name to be created', trim: true)
string(description: 'Runners', name: 'RUNNERS', defaultValue: '{"chrome_extensions":"true","cors_proxy_image":"true","dashbuilder_viewer_image":"true","dev_deployment_base_image":"true","dev_deployment_dmn_form_webapp_image":"true","dev_deployment_kogito_quakus_blank_app_image":"true","dev_deployment_upload_service":"true","extended_services":"true","jbpm_quarkus_devui":"true","kie_sandbox_extended_services_image":"true","kie_sandbox_helm_chart":"true","kie_sandbox_image":"true","kn_plugin_workflow":"true","kogito_task_console":"true","kogito_management_console":"true","kogito_swf_builder":"true","kogito_swf_devmode":"true","kogito_serverless_operator":"true","npm_packages":"true","online_editor":"true","runtime_tools_consoles_helm_chart":"true","serverless_logic_web_tools":"true","serverless_logic_web_tools_base_builder_image":"true","serverless_logic_web_tools_swf_builder_image":"true","serverless_logic_web_tools_swf_dev_mode_image":"true","standalone_editors_cdn":"true","sonataflow_quarkus_devui":"true","vscode_extensions_dev":"true","vscode_extensions_prod":"true"}')
string(description: 'Runners', name: 'RUNNERS', defaultValue: '{"chrome_extensions":"true","cors_proxy_image":"true","dashbuilder_viewer_image":"true","dev_deployment_base_image":"true","kie_sandbox_accelerator_quarkus":"true","dev_deployment_dmn_form_webapp_image":"true","dev_deployment_kogito_quakus_blank_app_image":"true","dev_deployment_upload_service":"true","extended_services":"true","jbpm_quarkus_devui":"true","kie_sandbox_extended_services_image":"true","kie_sandbox_helm_chart":"true","kie_sandbox_image":"true","kn_plugin_workflow":"true","kogito_task_console":"true","kogito_management_console":"true","kogito_swf_builder":"true","kogito_swf_devmode":"true","kogito_serverless_operator":"true","npm_packages":"true","online_editor":"true","runtime_tools_consoles_helm_chart":"true","serverless_logic_web_tools":"true","serverless_logic_web_tools_base_builder_image":"true","serverless_logic_web_tools_swf_builder_image":"true","serverless_logic_web_tools_swf_dev_mode_image":"true","standalone_editors_cdn":"true","sonataflow_quarkus_devui":"true","vscode_extensions_dev":"true","vscode_extensions_prod":"true"}')
}

stages {
Expand Down Expand Up @@ -72,7 +72,7 @@ pipeline {
steps {
dir('kie-tools') {
script {
buildUtils.setupPnpm("${pipelineVars.mavenSettingsConfigFileId}")
buildUtils.setupPnpm("${pipelineVars.mavenSettingsReleaseConfigFileId}")
}
}
}
Expand Down
125 changes: 0 additions & 125 deletions .ci/jenkins/Jenkinsfile.release-candidate.quarkus-accelerator

This file was deleted.

2 changes: 1 addition & 1 deletion .ci/jenkins/Jenkinsfile.release-dry-run
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pipeline {
build job: 'KIE/kie-tools/kie-tools-release-build', parameters: [
booleanParam(name: 'DRY_RUN', value: true),
string(name: 'BASE_REF', value: 'main'),
string(name: 'RUNNERS', value: '{"chrome_extensions":"true","cors_proxy_image":"true","dashbuilder_viewer_image":"true","dev_deployment_base_image":"true","dev_deployment_dmn_form_webapp_image":"true","dev_deployment_kogito_quakus_blank_app_image":"true","dev_deployment_upload_service":"true","extended_services":"true","jbpm_quarkus_devui":"true","kie_sandbox_extended_services_image":"true","kie_sandbox_helm_chart":"true","kie_sandbox_image":"true","kn_plugin_workflow":"true","kogito_task_console":"true","kogito_management_console":"true","kogito_swf_builder":"true","kogito_swf_devmode":"true","kogito_serverless_operator":"true","npm_packages":"true","online_editor":"true","runtime_tools_consoles_helm_chart":"true","serverless_logic_web_tools":"true","serverless_logic_web_tools_base_builder_image":"true","serverless_logic_web_tools_swf_builder_image":"true","serverless_logic_web_tools_swf_dev_mode_image":"true","standalone_editors_cdn":"true","sonataflow_quarkus_devui":"true","vscode_extensions_dev":"true","vscode_extensions_prod":"true"}')
string(name: 'RUNNERS', value: '{"chrome_extensions":"true","cors_proxy_image":"true","dashbuilder_viewer_image":"true","dev_deployment_base_image":"true","kie_sandbox_accelerator_quarkus":"true","dev_deployment_dmn_form_webapp_image":"true","dev_deployment_kogito_quakus_blank_app_image":"true","dev_deployment_upload_service":"true","extended_services":"true","jbpm_quarkus_devui":"true","kie_sandbox_extended_services_image":"true","kie_sandbox_helm_chart":"true","kie_sandbox_image":"true","kn_plugin_workflow":"true","kogito_task_console":"true","kogito_management_console":"true","kogito_swf_builder":"true","kogito_swf_devmode":"true","kogito_serverless_operator":"true","npm_packages":"true","online_editor":"true","runtime_tools_consoles_helm_chart":"true","serverless_logic_web_tools":"true","serverless_logic_web_tools_base_builder_image":"true","serverless_logic_web_tools_swf_builder_image":"true","serverless_logic_web_tools_swf_dev_mode_image":"true","standalone_editors_cdn":"true","sonataflow_quarkus_devui":"true","vscode_extensions_dev":"true","vscode_extensions_prod":"true"}')
]
}
}
Expand Down
Loading

0 comments on commit fdf929d

Please sign in to comment.