This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 3cc3182245d NO-ISSUE: Adjust Release jobs for all branches (#2433)
3cc3182245d is described below
commit 3cc3182245d3df828bf38dab4a22d6db3a93b4db
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Tue Jun 18 15:43:07 2024 -0300
NO-ISSUE: Adjust Release jobs for all branches (#2433)
---
.ci/incubator-kie-tools-ci-build.Dockerfile | 8 +--
.ci/jenkins/Jenkinsfile.ci-main | 66 +++++++++++-----------
.ci/jenkins/Jenkinsfile.daily-dev-publish | 8 +--
.ci/jenkins/ci-jobs/Jenkinsfile.ci-build | 21 ++-----
.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt | 15 +----
.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql | 19 +------
.../ci-jobs/Jenkinsfile.ci-check-dependencies | 19 +------
.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build | 65 ++++-----------------
...enkinsfile.dev-deployment-dmn-form-webapp-image | 2 +-
...e.dev-deployment-kogito-quarkus-blank-app-image | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.online-editor | 2 +-
.../Jenkinsfile.serverless-logic-web-tools | 2 +-
...le.serverless-logic-web-tools-swf-builder-image | 2 +-
.ci/jenkins/shared-scripts/dockerUtils.groovy | 2 +-
.ci/jenkins/shared-scripts/githubUtils.groovy | 18 ++----
.ci/jenkins/shared-scripts/pipelineVars.groovy | 3 +
16 files changed, 78 insertions(+), 176 deletions(-)
diff --git a/.ci/incubator-kie-tools-ci-build.Dockerfile
b/.ci/incubator-kie-tools-ci-build.Dockerfile
index 0d186be2ab8..9afe155d378 100644
--- a/.ci/incubator-kie-tools-ci-build.Dockerfile
+++ b/.ci/incubator-kie-tools-ci-build.Dockerfile
@@ -1,4 +1,4 @@
-FROM cruizba/ubuntu-dind:noble-26.1.3
+FROM cruizba/ubuntu-dind:jammy-26.1.3
SHELL ["/bin/bash", "-c"]
@@ -45,7 +45,7 @@ xvfb \
fluxbox \
subversion && \
apt-get clean autoclean && apt-get autoremove --yes && \
-rm -rf /var/lib/{apt,dpkg,cache,log}/
+rm -rf /var/lib/{apt,cache,log}/
# Install firefox
RUN wget -O /tmp/firefox-latest.tar.bz2
"https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"; &&
\
@@ -117,8 +117,8 @@ RUN wget
https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/opensh
sudo tar -C /usr/bin/ -xvzf /tmp/openshift-client-linux.tar.gz oc && rm
/tmp/openshift-client-linux.tar.gz
# Helm CLI setup
-RUN wget https://get.helm.sh/helm-v3.14.3-linux-amd64.tar.gz -P /tmp && \
- sudo tar -C /usr/bin/ -zxvf /tmp/helm-v3.14.3-linux-amd64.tar.gz
linux-amd64/helm --strip-components 1 && rm /tmp/helm-v3.14.3-linux-amd64.tar.gz
+RUN wget https://get.helm.sh/helm-v3.15.2-linux-amd64.tar.gz -P /tmp && \
+ sudo tar -C /usr/bin/ -zxvf /tmp/helm-v3.15.2-linux-amd64.tar.gz
linux-amd64/helm --strip-components 1 && rm /tmp/helm-v3.15.2-linux-amd64.tar.gz
# Python setup
RUN sudo update-alternatives --install /usr/local/bin/python python $(which
python3) 1 && \
diff --git a/.ci/jenkins/Jenkinsfile.ci-main b/.ci/jenkins/Jenkinsfile.ci-main
index aec1b1f1f5b..bf2df4027fa 100644
--- a/.ci/jenkins/Jenkinsfile.ci-main
+++ b/.ci/jenkins/Jenkinsfile.ci-main
@@ -28,51 +28,63 @@ pipeline {
}
environment {
- BUILD_IMAGE_TAG = 'latest'
BUILD_IMAGE_JOB_STATUS = 'SKIPPED'
+ DOCKER_CONFIG = "${WORKSPACE}/.docker"
}
stages {
stage('Load local shared scripts') {
steps {
script {
+ dockerUtils = load
'.ci/jenkins/shared-scripts/dockerUtils.groovy'
pipelineVars = load
'.ci/jenkins/shared-scripts/pipelineVars.groovy'
githubUtils = load
'.ci/jenkins/shared-scripts/githubUtils.groovy'
}
}
}
- stage('Checkout Apache KIE Tools (Simulated squashed merge)') {
+ stage('Clean workspace before build') {
+ steps {
+ cleanWs(deleteDirs: true, disableDeferredWipeout: true)
+ }
+ }
+
+ stage('Checkout kie-tools') {
+ steps {
+ dir('kie-tools') {
+ checkout scm
+ }
+ }
+ }
+
+ stage('Check KIE Tools CI Image build is required') {
steps {
dir('kie-tools') {
script {
- githubUtils.checkoutRepoSquashedMerge(
- env.CHANGE_AUTHOR,
- env.CHANGE_BRANCH,
-
"https://github.com/${env.CHANGE_AUTHOR}/${pipelineVars.githubRepositoryName}.git";,
- env.CHANGE_TARGET ?: env.BRANCH_NAME,
-
"https://github.com/${pipelineVars.githubRepositoryOrg}/${pipelineVars.githubRepositoryName}.git";,
- "${pipelineVars.kieToolsBotGithubCredentialsId}"
+ BUILD_IMAGE_REQUIRED = (
+
githubUtils.fileIsInChangeset("${env.BRANCH_NAME}",
'incubator-kie-tools-ci-build.Dockerfile')
+ || !dockerUtils.checkImageExistsInRegistry(
+ "${pipelineVars.kieToolsCiBuildImageRegistry}",
+ "${pipelineVars.kieToolsCiBuildImageAccount}",
+ "${pipelineVars.kieToolsCiBuildImageName}",
+ "${env.BRANCH_NAME}",
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
+ )
)
-
- BUILD_IMAGE_REQUIRED =
githubUtils.fileIsInChangeset('incubator-kie-tools-ci-build.Dockerfile')
}
}
}
}
- stage('Image Build') {
+ stage('Trigger KIE Tools CI image build job') {
when {
expression { BUILD_IMAGE_REQUIRED }
}
steps {
script {
- BUILD_IMAGE_TAG = "${env.GIT_COMMIT}"
BUILD_IMAGE_JOB_STATUS = build(
- job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-image-build/${BRANCH_NAME}",
- parameters: [
- string(name: 'IMAGE_TAG', value:
"${env.GIT_COMMIT}")
- ]
+ job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-image-build/${BRANCH_NAME}"
).result
}
}
@@ -87,10 +99,7 @@ pipeline {
steps {
script {
build(
- job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-build/${BRANCH_NAME}",
- parameters: [
- string(name: 'IMAGE_TAG', value:
"${BUILD_IMAGE_TAG}")
- ]
+ job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-build/${BRANCH_NAME}"
)
}
}
@@ -100,10 +109,7 @@ pipeline {
steps {
script {
build(
- job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-dependencies/${BRANCH_NAME}",
- parameters: [
- string(name: 'IMAGE_TAG', value:
"${BUILD_IMAGE_TAG}")
- ]
+ job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-dependencies/${BRANCH_NAME}"
)
}
}
@@ -113,10 +119,7 @@ pipeline {
steps {
script {
build(
- job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-code-formatting/${BRANCH_NAME}",
- parameters: [
- string(name: 'IMAGE_TAG', value:
"${BUILD_IMAGE_TAG}")
- ]
+ job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-code-formatting/${BRANCH_NAME}"
)
}
}
@@ -126,10 +129,7 @@ pipeline {
steps {
script {
build(
- job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-code-quality/${BRANCH_NAME}",
- parameters: [
- string(name: 'IMAGE_TAG', value:
"${BUILD_IMAGE_TAG}")
- ]
+ job:
"KIE/kie-tools/kie-tools-ci-jobs/kie-tools-ci-check-code-quality/${BRANCH_NAME}"
)
}
}
diff --git a/.ci/jenkins/Jenkinsfile.daily-dev-publish
b/.ci/jenkins/Jenkinsfile.daily-dev-publish
index 77e743005a0..d14b25e51b7 100644
--- a/.ci/jenkins/Jenkinsfile.daily-dev-publish
+++ b/.ci/jenkins/Jenkinsfile.daily-dev-publish
@@ -45,12 +45,12 @@ pipeline {
DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry = 'docker.io'
DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account = 'apache'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name =
'incubator-dev-deployment-kogito-quarkus-blank-app'
+ DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag = 'daily-dev'
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry = 'docker.io'
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account = 'apache'
- DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__name =
'incubator-dev-deployment-dmn-form-webapp'
+ DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-dmn-form-webapp'
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__buildTag = 'daily-dev'
ONLINE_EDITOR__devDeploymentBaseImageRegistry = 'docker.io'
@@ -63,7 +63,7 @@ pipeline {
ONLINE_EDITOR__devDeploymentDmnFormWebappImageTag = 'daily-dev'
ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageRegistry =
'docker.io'
ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageAccount =
'apache'
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageName =
'incubator-kie-sandbox-dev-deployment-kogito-quarkus-blank-app'
+ ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageName =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageTag = 'daily-dev'
ONLINE_EDITOR__corsProxyUrl =
'https://daily-dev-cors-proxy-kie-sandbox.rhba-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud'
@@ -101,7 +101,7 @@ pipeline {
SERVERLESS_LOGIC_WEB_TOOLS__dashbuilderViewerImageTag = 'daily-dev'
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry = 'docker.io'
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount = 'apache'
- SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName =
'incubator-serverless-logic-web-tools-swf-builder'
+ SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName =
'incubator-kie-serverless-logic-web-tools-swf-builder'
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageTag = 'daily-dev'
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageBuildTags = 'daily-dev'
SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry = 'docker.io'
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-build
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-build
index 38c583ed9be..55f88d85f85 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-build
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-build
@@ -21,10 +21,6 @@ pipeline {
timeout(time: 600, unit: 'MINUTES')
}
- parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
- }
-
environment {
TESTS_REPORTS_PATTERNS =
'kie-tools/packages/**/dist-tests/junit-report*.xml
kie-tools/examples/**/dist-tests/junit-report*.xml
kie-tools/packages/**/target/surefire-reports/TEST-*.xml
kie-tools/examples/**/target/surefire-reports/TEST-*.xml'
END_TO_END_TESTS_REPORTS_PATTERNS =
'kie-tools/packages/**/dist-tests-e2e/junit-report*.xml
kie-tools/examples/**/dist-tests-e2e/junit-report*.xml
kie-tools/packages/**/target/failsafe-reports/TEST-*.xml
kie-tools/examples/**/target/failsafe-reports/TEST-*.xml'
@@ -49,7 +45,7 @@ pipeline {
agent {
docker {
label("${buildUtils.apacheAgentLabels()}")
- image
"docker.io/apache/incubator-kie-tools-ci-build:${params.IMAGE_TAG}"
+ image
"docker.io/apache/incubator-kie-tools-ci-build:${env.BRANCH_NAME}"
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -69,19 +65,10 @@ pipeline {
}
}
- stage('Checkout Apache KIE Tools (Simulated squashed merge)') {
+ stage('Checkout kie-tools') {
steps {
dir('kie-tools') {
- script {
- githubUtils.checkoutRepoSquashedMerge(
- env.CHANGE_AUTHOR,
- env.CHANGE_BRANCH,
-
"https://github.com/${env.CHANGE_AUTHOR}/${pipelineVars.githubRepositoryName}.git";,
- env.CHANGE_TARGET ?: env.BRANCH_NAME,
-
"https://github.com/${pipelineVars.githubRepositoryOrg}/${pipelineVars.githubRepositoryName}.git";,
-
"${pipelineVars.kieToolsBotGithubCredentialsId}"
- )
- }
+ checkout scm
}
}
}
@@ -151,7 +138,7 @@ pipeline {
stage('Upload end-to-end tests results to Buildkite (`main`
only)') {
when {
- expression { !env.CHANGE_ID && env.BRANCH_NAME ==
'main' && env.ENABLE_BUILDKITE == 'true' }
+ expression { env.BRANCH_NAME == 'main' &&
env.ENABLE_BUILDKITE == 'true' }
}
steps {
dir('kie-tools') {
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt
index c58819b5cb5..71fc7917dfd 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt
@@ -38,7 +38,7 @@ pipeline {
stage('Check code formatting') {
agent {
docker {
- image
"docker.io/apache/incubator-kie-tools-ci-build:${params.IMAGE_TAG}"
+ image
"docker.io/apache/incubator-kie-tools-ci-build:${env.BRANCH_NAME}"
}
}
@@ -49,19 +49,10 @@ pipeline {
}
}
- stage('Checkout Apache KIE Tools (Simulated squashed merge)') {
+ stage('Checkout kie-tools') {
steps {
dir('kie-tools') {
- script {
- githubUtils.checkoutRepoSquashedMerge(
- env.CHANGE_AUTHOR,
- env.CHANGE_BRANCH,
-
"https://github.com/${env.CHANGE_AUTHOR}/${pipelineVars.githubRepositoryName}.git";,
- env.CHANGE_TARGET ?: env.BRANCH_NAME,
-
"https://github.com/${pipelineVars.githubRepositoryOrg}/${pipelineVars.githubRepositoryName}.git";,
-
"${pipelineVars.kieToolsBotGithubCredentialsId}"
- )
- }
+ checkout scm
}
}
}
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql
index e091d6e5461..3372754b0c1 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql
@@ -21,10 +21,6 @@ pipeline {
timeout(time: 240, unit: 'MINUTES')
}
- parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
- }
-
environment {
RESULTS_DIR = '/tmp/codeql/results'
DATABASE_DIR = '/tmp/codeql/db'
@@ -48,7 +44,7 @@ pipeline {
stage('Check code quality') {
agent {
docker {
- image
"docker.io/apache/incubator-kie-tools-ci-build:${params.IMAGE_TAG}"
+ image
"docker.io/apache/incubator-kie-tools-ci-build:${env.BRANCH_NAME}"
}
}
@@ -59,19 +55,10 @@ pipeline {
}
}
- stage('Checkout Apache KIE Tools (Simulated squashed merge)') {
+ stage('Checkout kie-tools') {
steps {
dir('kie-tools') {
- script {
- githubUtils.checkoutRepoSquashedMerge(
- env.CHANGE_AUTHOR,
- env.CHANGE_BRANCH,
-
"https://github.com/${env.CHANGE_AUTHOR}/${pipelineVars.githubRepositoryName}.git";,
- env.CHANGE_TARGET ?: env.BRANCH_NAME,
-
"https://github.com/${pipelineVars.githubRepositoryOrg}/${pipelineVars.githubRepositoryName}.git";,
-
"${pipelineVars.kieToolsBotGithubCredentialsId}"
- )
- }
+ checkout scm
}
}
}
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
index a939aed9f16..384a5ba3841 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
@@ -21,10 +21,6 @@ pipeline {
timeout(time: 240, unit: 'MINUTES')
}
- parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
- }
-
stages {
stage('Load local shared scripts') {
steps {
@@ -38,7 +34,7 @@ pipeline {
stage('Check dependencies consistency') {
agent {
docker {
- image
"docker.io/apache/incubator-kie-tools-ci-build:${params.IMAGE_TAG}"
+ image
"docker.io/apache/incubator-kie-tools-ci-build:${env.BRANCH_NAME}"
}
}
@@ -49,19 +45,10 @@ pipeline {
}
}
- stage('Checkout Apache KIE Tools (Simulated squashed merge)') {
+ stage('Checkout kie-tools') {
steps {
dir('kie-tools') {
- script {
- githubUtils.checkoutRepoSquashedMerge(
- env.CHANGE_AUTHOR,
- env.CHANGE_BRANCH,
-
"https://github.com/${env.CHANGE_AUTHOR}/${pipelineVars.githubRepositoryName}.git";,
- env.CHANGE_TARGET ?: env.BRANCH_NAME,
-
"https://github.com/${pipelineVars.githubRepositoryOrg}/${pipelineVars.githubRepositoryName}.git";,
-
"${pipelineVars.kieToolsBotGithubCredentialsId}"
- )
- }
+ checkout scm
}
}
}
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
index 15c4952fbe3..ff9a7444466 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
@@ -18,14 +18,10 @@ pipeline {
agent any
parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
+ string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
"${env.BRANCH_NAME}")
}
environment {
- IMAGE_REGISTRY = 'docker.io'
- IMAGE_ACCOUNT = 'apache'
- IMAGE_NAME = 'incubator-kie-tools-ci-build'
- IMAGE_NAME_TAG =
"${IMAGE_REGISTRY}/${IMAGE_ACCOUNT}/${IMAGE_NAME}:${params.IMAGE_TAG}"
DOCKER_CONFIG = "${WORKSPACE}/.docker"
}
@@ -44,79 +40,38 @@ pipeline {
}
}
- stage('Clean workspace') {
+ stage('Clean workspace before build') {
steps {
cleanWs(deleteDirs: true, disableDeferredWipeout: true)
}
}
- stage('Checkout Apache KIE Tools (Simulated squashed merge)') {
+ stage('Checkout kie-tools') {
steps {
dir('kie-tools') {
- script {
- githubUtils.checkoutRepoSquashedMerge(
- env.CHANGE_AUTHOR,
- env.CHANGE_BRANCH,
-
"https://github.com/${env.CHANGE_AUTHOR}/${pipelineVars.githubRepositoryName}.git";,
- env.CHANGE_TARGET ?: env.BRANCH_NAME,
-
"https://github.com/${pipelineVars.githubRepositoryOrg}/${pipelineVars.githubRepositoryName}.git";,
- "${pipelineVars.kieToolsBotGithubCredentialsId}"
- )
- }
+ checkout scm
}
}
}
- stage('Check image tag already exists') {
- steps {
- script {
- IMAGE_EXISTS = dockerUtils.checkImageExistsInRegistry(
- "${IMAGE_REGISTRY}",
- "${IMAGE_ACCOUNT}",
- "${IMAGE_NAME}",
- "${params.IMAGE_TAG}",
- "${pipelineVars.dockerHubUserCredentialsId}",
- "${pipelineVars.dockerHubTokenCredentialsId}"
- )
- }
- }
- }
-
- // Trigger by PR = Tag is GIT commit hash and it has expiration = 1d
- // Trigger by Branch = Tags are GIT commit and latest and they have no
expiration
stage('Build image') {
- when {
- expression { !IMAGE_EXISTS }
- }
steps {
dir('kie-tools') {
script {
- if (!env.CHANGE_ID && env.BRANCH_NAME == 'main') {
- sh """
- docker build -t ${IMAGE_NAME_TAG} -f
.ci/incubator-kie-tools-ci-build.Dockerfile .
- docker tag ${IMAGE_NAME_TAG}
${IMAGE_ACCOUNT}/${IMAGE_NAME}:main
- """
- IMAGE_TAGS = "${params.IMAGE_TAG} latest"
- } else {
- sh "docker build -t ${IMAGE_NAME_TAG} -f
.ci/incubator-kie-tools-ci-build.Dockerfile ."
- IMAGE_TAGS = "${params.IMAGE_TAG}"
- }
+ sh "docker build -t
${pipelineVars.kieToolsCiBuildImageRegistry}/${pipelineVars.kieToolsCiBuildImageAccount}/${pipelineVars.kieToolsCiBuildImageName}:${params.IMAGE_TAG}
-f .ci/incubator-kie-tools-ci-build.Dockerfile ."
}
}
}
}
stage('Push image to registry') {
- when {
- expression { !IMAGE_EXISTS }
- }
steps {
script {
dockerUtils.pushImageToRegistry(
- "${IMAGE_REGISTRY}",
- "${IMAGE_ACCOUNT}",
- "${IMAGE_NAME}",
- "${IMAGE_TAGS}",
+ "${pipelineVars.kieToolsCiBuildImageRegistry}",
+ "${pipelineVars.kieToolsCiBuildImageAccount}",
+ "${pipelineVars.kieToolsCiBuildImageName}",
+ "${params.IMAGE_TAG}",
"${pipelineVars.dockerHubUserCredentialsId}",
"${pipelineVars.dockerHubTokenCredentialsId}"
)
@@ -127,7 +82,7 @@ pipeline {
stage('Test built image') {
agent {
docker {
- image env.IMAGE_NAME_TAG
+ image
"${pipelineVars.kieToolsCiBuildImageRegistry}/${pipelineVars.kieToolsCiBuildImageAccount}/${pipelineVars.kieToolsCiBuildImageName}:${params.IMAGE_TAG}"
}
}
steps {
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 af5f01b0f48..c2e5edbb442 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
@@ -42,7 +42,7 @@ pipeline {
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry = 'docker.io'
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account = 'apache'
- DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__name =
'incubator-dev-deployment-dmn-form-webapp'
+ DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-dmn-form-webapp'
DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__buildTag = "latest
${params.RELEASE_VERSION}"
RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts"
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 2ea86b8fdeb..22897b8e88d 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
@@ -42,7 +42,7 @@ pipeline {
DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry = 'docker.io'
DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account = 'apache'
- DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name =
'incubator-dev-deployment-kogito-quarkus-blank-app'
+ DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag = "latest
${params.RELEASE_VERSION}"
RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts"
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
index 8b8a7e01b1c..0c4778554b5 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
@@ -55,7 +55,7 @@ pipeline {
ONLINE_EDITOR__devDeploymentDmnFormWebappImageTag =
"${params.RELEASE_VERSION}"
ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageRegistry =
'docker.io'
ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageAccount =
'apache'
- ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageName =
'incubator-kie-sandbox-dev-deployment-kogito-quarkus-blank-app'
+ ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageName =
'incubator-kie-sandbox-dev-deployment-quarkus-blank-app'
ONLINE_EDITOR__devDeploymentKogitoQuarkusBlankAppImageTag =
"${params.RELEASE_VERSION}"
ONLINE_EDITOR__gtmId = 'GTM-PQGMKNW'
ONLINE_EDITOR__corsProxyUrl =
'https://cors-proxy-kie-sandbox.rhba-0ad6762cc85bcef5745bb684498c2436-0000.us-south.containers.appdomain.cloud'
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
index f19d3ea5160..db0b44a70ae 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
@@ -43,7 +43,7 @@ pipeline {
SERVERLESS_LOGIC_WEB_TOOLS__buildInfo = ''
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry = 'docker.io'
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount = 'apache'
- SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName =
'incubator-serverless-logic-web-tools-swf-builder'
+ SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName =
'incubator-kie-serverless-logic-web-tools-swf-builder'
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageTag =
"${params.RELEASE_VERSION}"
SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry = 'docker.io'
SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount = 'apache'
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 e1e7a904973..cf0b4e42d55 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
@@ -42,7 +42,7 @@ pipeline {
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry = 'docker.io'
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount = 'apache'
- SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName =
'incubator-serverless-logic-web-tools-swf-builder'
+ SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName =
'incubator-kie-serverless-logic-web-tools-swf-builder'
SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageBuildTags = "latest
${params.RELEASE_VERSION}"
RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts"
diff --git a/.ci/jenkins/shared-scripts/dockerUtils.groovy
b/.ci/jenkins/shared-scripts/dockerUtils.groovy
index 9631777b42e..c36f1f0dc32 100644
--- a/.ci/jenkins/shared-scripts/dockerUtils.groovy
+++ b/.ci/jenkins/shared-scripts/dockerUtils.groovy
@@ -43,7 +43,7 @@ def checkImageExistsInRegistry(String registry, String
account, String image, St
echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_USER}"
--password-stdin $registry
""".trim()
result = sh returnStatus: true, script: """
- docker manifest inspect $registry/$account/$image:$tag > /dev/null
2>&1
+ docker manifest inspect $registry/$account/$image:$tag > /dev/null
""".trim()
sh 'docker logout'
return result == 0
diff --git a/.ci/jenkins/shared-scripts/githubUtils.groovy
b/.ci/jenkins/shared-scripts/githubUtils.groovy
index bbf28eade07..f1f2eff26a3 100644
--- a/.ci/jenkins/shared-scripts/githubUtils.groovy
+++ b/.ci/jenkins/shared-scripts/githubUtils.groovy
@@ -158,22 +158,14 @@ def getRepoSlug(String url) {
return "${org}/${repo}"
}
-/**
-* @return the files changed in the last commit
-*/
-def getChangesetLastCommit() {
- changeset = sh returnStdout: true, script: '''
- git diff --name-only HEAD HEAD~1
- '''.trim()
-
- return changeset
-}
-
/**
* @return if a given file is in the changeset of the last commit
*/
-def fileIsInChangeset(String file) {
- changeset = getChangesetLastCommit()
+def fileIsInChangeset(String branch, String file) {
+ changeset = sh returnStdout: true, script: """
+ git checkout ${branch}
+ git diff --name-only HEAD HEAD~1
+ """.trim()
return changeset.contains(file)
}
diff --git a/.ci/jenkins/shared-scripts/pipelineVars.groovy
b/.ci/jenkins/shared-scripts/pipelineVars.groovy
index eeaa6096e01..17f029b6868 100644
--- a/.ci/jenkins/shared-scripts/pipelineVars.groovy
+++ b/.ci/jenkins/shared-scripts/pipelineVars.groovy
@@ -42,6 +42,9 @@ class PipelineVars implements Serializable {
String asfReleaseGPGKeyCredentialsId = 'asf-release-gpg-signing-key'
String asfReleaseGPGKeyPasswordCredentialsId =
'asf-release-gpg-signing-key-passphrase'
String asfReleaseSVNStagingCredentialsId = 'asf-release-svn-staging'
+ String kieToolsCiBuildImageRegistry = 'docker.io'
+ String kieToolsCiBuildImageAccount = 'apache'
+ String kieToolsCiBuildImageName = 'incubator-kie-tools-ci-build'
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
