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 aeee25d90e0 kie-issues#1219 - Configure Dockerhub credentials on KIE
Tools CI pipelines (#2415)
aeee25d90e0 is described below
commit aeee25d90e0d8d743b0f6a4fad5409e8da998bde
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Mon Jun 10 12:58:49 2024 -0300
kie-issues#1219 - Configure Dockerhub credentials on KIE Tools CI pipelines
(#2415)
---
.ci/jenkins/Jenkinsfile.daily-dev-publish | 50 ++++++++++++++--------
.ci/jenkins/Jenkinsfile.release-build | 2 +-
.ci/jenkins/Jenkinsfile.release-candidate | 2 +-
.ci/jenkins/Jenkinsfile.release-dry-run | 2 +-
.ci/jenkins/Jenkinsfile.release-publish | 2 +-
.ci/jenkins/Jenkinsfile.setup-branch | 2 +-
.../Jenkinsfile.setup-branch.quarkus-accelerator | 2 +-
.ci/jenkins/Jenkinsfile.weekly-publish | 2 +-
.ci/jenkins/ci-jobs/Jenkinsfile.ci-build | 4 +-
.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt | 4 +-
.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql | 4 +-
.../ci-jobs/Jenkinsfile.ci-check-dependencies | 4 +-
.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build | 13 +++---
.../release-jobs/Jenkinsfile.chrome-extensions | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy | 5 ++-
.../Jenkinsfile.dashbuilder-viewer-image | 5 ++-
.../Jenkinsfile.dev-deployment-base-image | 5 ++-
...enkinsfile.dev-deployment-dmn-form-webapp-image | 5 ++-
...e.dev-deployment-kogito-quarkus-blank-app-image | 5 ++-
.../Jenkinsfile.dev-deployment-upload-service | 2 +-
.../release-jobs/Jenkinsfile.extended-services | 2 +-
.../release-jobs/Jenkinsfile.jbpm-quarkus-devui | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox | 5 ++-
.../Jenkinsfile.kie-sandbox-extended-services | 5 ++-
.../Jenkinsfile.kie-sandbox-helm-chart | 5 ++-
.../release-jobs/Jenkinsfile.kn-plugin-workflow | 2 +-
.../Jenkinsfile.kogito-management-console | 5 ++-
.../Jenkinsfile.kogito-serverless-operator | 5 ++-
.../release-jobs/Jenkinsfile.kogito-swf-builder | 5 ++-
.../release-jobs/Jenkinsfile.kogito-swf-devmode | 5 ++-
.../release-jobs/Jenkinsfile.kogito-task-console | 5 ++-
.ci/jenkins/release-jobs/Jenkinsfile.npm-packages | 2 +-
.ci/jenkins/release-jobs/Jenkinsfile.online-editor | 2 +-
.../Jenkinsfile.serverless-logic-web-tools | 2 +-
...e.serverless-logic-web-tools-base-builder-image | 5 ++-
...le.serverless-logic-web-tools-swf-builder-image | 5 ++-
...e.serverless-logic-web-tools-swf-dev-mode-image | 5 ++-
.../Jenkinsfile.sonataflow-quarkus-devui | 2 +-
.../Jenkinsfile.standalone-editors-cdn | 2 +-
.../release-jobs/Jenkinsfile.vscode-extensions-dev | 2 +-
.../Jenkinsfile.vscode-extensions-prod | 2 +-
.ci/jenkins/shared-scripts/dockerUtils.groovy | 34 ++++++++-------
.ci/jenkins/shared-scripts/pipelineVars.groovy | 3 +-
43 files changed, 137 insertions(+), 97 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.daily-dev-publish
b/.ci/jenkins/Jenkinsfile.daily-dev-publish
index 51d2def7daa..4c4a49598de 100644
--- a/.ci/jenkins/Jenkinsfile.daily-dev-publish
+++ b/.ci/jenkins/Jenkinsfile.daily-dev-publish
@@ -20,7 +20,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
label util.avoidFaultyNodes()
}
@@ -241,7 +241,8 @@ pipeline {
"${env.SONATAFLOW_BUILDER_IMAGE__registry}/${env.SONATAFLOW_BUILDER_IMAGE__account}",
"${env.SONATAFLOW_BUILDER_IMAGE__name}",
"${env.SONATAFLOW_BUILDER_IMAGE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -254,7 +255,8 @@ pipeline {
"${env.SONATAFLOW_DEVMODE_IMAGE__registry}/${env.SONATAFLOW_DEVMODE_IMAGE__account}",
"${env.SONATAFLOW_DEVMODE_IMAGE__name}",
"${env.SONATAFLOW_DEVMODE_IMAGE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -267,7 +269,8 @@ pipeline {
"${env.SONATAFLOW_OPERATOR__registry}/${env.SONATAFLOW_OPERATOR__account}",
"${env.SONATAFLOW_OPERATOR__name}",
"${env.SONATAFLOW_OPERATOR__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -280,7 +283,8 @@ pipeline {
"${env.DEV_DEPLOYMENT_BASE_IMAGE__registry}/${env.DEV_DEPLOYMENT_BASE_IMAGE__account}",
"${env.DEV_DEPLOYMENT_BASE_IMAGE__name}",
"${env.DEV_DEPLOYMENT_BASE_IMAGE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -293,7 +297,8 @@ pipeline {
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry}/${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account}",
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__name}",
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -306,7 +311,8 @@ pipeline {
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}/${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}",
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name}",
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -319,7 +325,8 @@ pipeline {
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry}/${env.KIE_SANDBOX_EXTENDED_SERVICES__imageAccount}",
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageName}",
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -350,7 +357,8 @@ pipeline {
"${env.CORS_PROXY_IMAGE__imageRegistry}/${env.CORS_PROXY_IMAGE__imageAccount}",
"${env.CORS_PROXY_IMAGE__imageName}",
"${env.CORS_PROXY_IMAGE__imageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -381,7 +389,8 @@ pipeline {
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageRegistry}/${env.KIE_SANDBOX_WEBAPP_IMAGE__imageAccount}",
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageName}",
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -420,7 +429,8 @@ pipeline {
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -433,7 +443,8 @@ pipeline {
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -446,7 +457,8 @@ pipeline {
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -459,7 +471,8 @@ pipeline {
"${env.DASHBUILDER__viewerImageRegistry}/${env.DASHBUILDER__viewerImageAccount}",
"${env.DASHBUILDER__viewerImageName}",
"${env.DASHBUILDER__viewerImageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -472,7 +485,8 @@ pipeline {
"${env.KOGITO_TASK_CONSOLE__registry}/${env.KOGITO_TASK_CONSOLE__account}",
"${env.KOGITO_TASK_CONSOLE__name}",
"${env.KOGITO_TASK_CONSOLE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -485,7 +499,8 @@ pipeline {
"${env.KOGITO_MANAGEMENT_CONSOLE__registry}/${env.KOGITO_MANAGEMENT_CONSOLE__account}",
"${env.KOGITO_MANAGEMENT_CONSOLE__name}",
"${env.KOGITO_MANAGEMENT_CONSOLE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -498,7 +513,8 @@ pipeline {
helmUtils.pushChartToRegistry(
"${env.KIE_SANDBOX_HELM_CHART__registry}/${env.KIE_SANDBOX_HELM_CHART__account}",
"packages/kie-sandbox-helm-chart/dist/${env.KIE_SANDBOX_HELM_CHART__name}-${env.KIE_SANDBOX_HELM_CHART__tag}.tgz",
-
"${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/Jenkinsfile.release-build
b/.ci/jenkins/Jenkinsfile.release-build
index 061f56adceb..15cfa071494 100644
--- a/.ci/jenkins/Jenkinsfile.release-build
+++ b/.ci/jenkins/Jenkinsfile.release-build
@@ -20,7 +20,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
label util.avoidFaultyNodes()
}
diff --git a/.ci/jenkins/Jenkinsfile.release-candidate
b/.ci/jenkins/Jenkinsfile.release-candidate
index 51d80cb2c7c..8476f256969 100644
--- a/.ci/jenkins/Jenkinsfile.release-candidate
+++ b/.ci/jenkins/Jenkinsfile.release-candidate
@@ -20,7 +20,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
label util.avoidFaultyNodes()
}
diff --git a/.ci/jenkins/Jenkinsfile.release-dry-run
b/.ci/jenkins/Jenkinsfile.release-dry-run
index 5afed3babde..81252dbc6e3 100644
--- a/.ci/jenkins/Jenkinsfile.release-dry-run
+++ b/.ci/jenkins/Jenkinsfile.release-dry-run
@@ -20,7 +20,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
label util.avoidFaultyNodes()
}
}
diff --git a/.ci/jenkins/Jenkinsfile.release-publish
b/.ci/jenkins/Jenkinsfile.release-publish
index 00c1b5e619f..8e920d7cb20 100644
--- a/.ci/jenkins/Jenkinsfile.release-publish
+++ b/.ci/jenkins/Jenkinsfile.release-publish
@@ -20,7 +20,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
label util.avoidFaultyNodes()
}
}
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch
b/.ci/jenkins/Jenkinsfile.setup-branch
index a388eaefa7f..4a6463ba41b 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -20,7 +20,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
label util.avoidFaultyNodes()
}
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch.quarkus-accelerator
b/.ci/jenkins/Jenkinsfile.setup-branch.quarkus-accelerator
index 6ccd3a0f88d..813e1582c39 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch.quarkus-accelerator
+++ b/.ci/jenkins/Jenkinsfile.setup-branch.quarkus-accelerator
@@ -20,7 +20,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
label util.avoidFaultyNodes()
}
diff --git a/.ci/jenkins/Jenkinsfile.weekly-publish
b/.ci/jenkins/Jenkinsfile.weekly-publish
index df035d9d1d8..6ca9e6dc1d7 100644
--- a/.ci/jenkins/Jenkinsfile.weekly-publish
+++ b/.ci/jenkins/Jenkinsfile.weekly-publish
@@ -25,7 +25,7 @@ def dateDefaultValue = sdf.format(new Date())
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
label util.avoidFaultyNodes()
}
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-build
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-build
index 5495b13bc7c..1a432ec2963 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-build
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-build
@@ -22,7 +22,7 @@ pipeline {
}
parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'latest')
+ string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
}
environment {
@@ -49,7 +49,7 @@ pipeline {
agent {
docker {
label("${buildUtils.apacheAgentLabels()}")
- image
"quay.io/kie-tools/kie-tools-ci-build:${params.IMAGE_TAG}"
+ image
"docker.io/apache/incubator-kie-tools-ci-build:${params.IMAGE_TAG}"
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt
index 0214ec331b4..c58819b5cb5 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-code-fmt
@@ -22,7 +22,7 @@ pipeline {
}
parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'latest')
+ string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
}
stages {
@@ -38,7 +38,7 @@ pipeline {
stage('Check code formatting') {
agent {
docker {
- image
"quay.io/kie-tools/kie-tools-ci-build:${params.IMAGE_TAG}"
+ image
"docker.io/apache/incubator-kie-tools-ci-build:${params.IMAGE_TAG}"
}
}
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql
index 386c3976295..e091d6e5461 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-codeql
@@ -22,7 +22,7 @@ pipeline {
}
parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'latest')
+ string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
}
environment {
@@ -48,7 +48,7 @@ pipeline {
stage('Check code quality') {
agent {
docker {
- image
"quay.io/kie-tools/kie-tools-ci-build:${params.IMAGE_TAG}"
+ image
"docker.io/apache/incubator-kie-tools-ci-build:${params.IMAGE_TAG}"
}
}
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
index 75f0c200148..a939aed9f16 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-check-dependencies
@@ -22,7 +22,7 @@ pipeline {
}
parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'latest')
+ string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
}
stages {
@@ -38,7 +38,7 @@ pipeline {
stage('Check dependencies consistency') {
agent {
docker {
- image
"quay.io/kie-tools/kie-tools-ci-build:${params.IMAGE_TAG}"
+ image
"docker.io/apache/incubator-kie-tools-ci-build:${params.IMAGE_TAG}"
}
}
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
index 811e31e06b5..2dedae60eeb 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
@@ -18,12 +18,12 @@ pipeline {
agent any
parameters {
- string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'latest')
+ string(description: 'Image tag', name: 'IMAGE_TAG', defaultValue:
'main')
}
environment {
- IMAGE_ACCOUNT = 'quay.io/kie-tools'
- IMAGE_NAME = 'kie-tools-ci-build'
+ IMAGE_ACCOUNT = 'docker.io/apache'
+ IMAGE_NAME = 'incubator-kie-tools-ci-build'
IMAGE_NAME_TAG = "${IMAGE_ACCOUNT}/${IMAGE_NAME}:${params.IMAGE_TAG}"
DOCKER_CONFIG = "${WORKSPACE}/.docker"
}
@@ -73,7 +73,8 @@ pipeline {
"${IMAGE_ACCOUNT}",
"${IMAGE_NAME}",
"${params.IMAGE_TAG}",
- "${pipelineVars.quayPushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -91,7 +92,7 @@ pipeline {
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}:latest
+ docker tag ${IMAGE_NAME_TAG}
${IMAGE_ACCOUNT}/${IMAGE_NAME}:main
"""
IMAGE_TAGS = "${params.IMAGE_TAG} latest"
} else {
@@ -133,6 +134,8 @@ pipeline {
node --version
npm --version
pnpm --version
+ python --version
+ helm version
go version
'''.trim()
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
index 4eeb5dc3d2b..e7c5057519d 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
index 5160863dbf7..6a2e4f42e1c 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -148,7 +148,8 @@ pipeline {
"${env.CORS_PROXY_IMAGE__imageRegistry}/${env.CORS_PROXY_IMAGE__imageAccount}",
"${env.CORS_PROXY_IMAGE__imageName}",
"${env.CORS_PROXY_IMAGE__imageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image
b/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image
index 1100a24ff2a..674d6c4c8b9 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.DASHBUILDER__viewerImageRegistry}/${env.DASHBUILDER__viewerImageAccount}",
"${env.DASHBUILDER__viewerImageName}",
"${env.DASHBUILDER__viewerImageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image
b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image
index a36c9ca89c8..68ea4c926e1 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.DEV_DEPLOYMENT_BASE_IMAGE__registry}/${env.DEV_DEPLOYMENT_BASE_IMAGE__account}",
"${env.DEV_DEPLOYMENT_BASE_IMAGE__name}",
"${env.DEV_DEPLOYMENT_BASE_IMAGE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
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 5582e6877e1..1e85b6f98c5 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
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry}/${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account}",
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__name}",
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
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 6092b896751..f59b822caf7 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
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}/${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}",
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name}",
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-upload-service
b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-upload-service
index 9e05617a38c..0b9d5f6ac12 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-upload-service
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-upload-service
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
b/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
index 56979afa731..c435fc20137 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.extended-services
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
b/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
index 0dc1c5382b9..7c4dfd1070f 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
index bd02a3462de..adb686fe7cd 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -164,7 +164,8 @@ pipeline {
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageRegistry}/${env.KIE_SANDBOX_WEBAPP_IMAGE__imageAccount}",
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageName}",
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services
b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services
index 623add79608..a256181892d 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -148,7 +148,8 @@ pipeline {
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry}/${env.KIE_SANDBOX_EXTENDED_SERVICES__imageAccount}",
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageName}",
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart
b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart
index cafccf099ee..1d3a8f9c919 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-helm-chart
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
helmUtils.pushChartToRegistry(
"${env.KIE_SANDBOX_HELM_CHART__registry}/${env.KIE_SANDBOX_HELM_CHART__account}",
"packages/kie-sandbox-helm-chart/dist/${env.KIE_SANDBOX_HELM_CHART__name}-${env.KIE_SANDBOX_HELM_CHART__tag}.tgz",
-
"${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
b/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
index c845e540227..93149eccd8f 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kn-plugin-workflow
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console
index 3d59128056b..f915c2ef766 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.KOGITO_MANAGEMENT_CONSOLE__registry}/${env.KOGITO_MANAGEMENT_CONSOLE__account}",
"${env.KOGITO_MANAGEMENT_CONSOLE__name}",
"${env.KOGITO_MANAGEMENT_CONSOLE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
index 039b793bb25..308bce27de0 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -174,7 +174,8 @@ pipeline {
"${env.SONATAFLOW_OPERATOR__registry}/${env.SONATAFLOW_OPERATOR__account}",
"${env.SONATAFLOW_OPERATOR__name}",
"${env.SONATAFLOW_OPERATOR__buildTag} latest",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
index d373c973984..15b66cc378f 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -156,7 +156,8 @@ pipeline {
"${env.SONATAFLOW_BUILDER_IMAGE__registry}/${env.SONATAFLOW_BUILDER_IMAGE__account}",
"${env.SONATAFLOW_BUILDER_IMAGE__name}",
"${env.SONATAFLOW_BUILDER_IMAGE__buildTag} latest",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
index 9b2d1c02c61..5beeb953f6f 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -156,7 +156,8 @@ pipeline {
"${env.SONATAFLOW_DEVMODE_IMAGE__registry}/${env.SONATAFLOW_DEVMODE_IMAGE__account}",
"${env.SONATAFLOW_DEVMODE_IMAGE__name}",
"${env.SONATAFLOW_DEVMODE_IMAGE__buildTag} latest",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
index b2a8d48c22f..9ebc8427f39 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.KOGITO_TASK_CONSOLE__registry}/${env.KOGITO_TASK_CONSOLE__account}",
"${env.KOGITO_TASK_CONSOLE__name}",
"${env.KOGITO_TASK_CONSOLE__buildTag}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
b/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
index 66028127bda..7231f1a564b 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.npm-packages
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
index 8a4868c45c4..8b8a7e01b1c 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.online-editor
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
index 6f07b3d6326..f19d3ea5160 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
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 b01f4d35164..82a748cf428 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
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
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 2ac20d16295..71f5e052b1c 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
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
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 3c389eab9fc..e3861299405 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
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
@@ -143,7 +143,8 @@ pipeline {
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageBuildTags}",
- "${pipelineVars.dockerHubApacheKiePushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui
b/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui
index c5991a61e0f..d39c2a8dc0c 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn
b/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn
index 64dcdef206a..4d8450efbea 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.standalone-editors-cdn
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
index 41950314766..c80ed3f0756 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-dev
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
index dea007935ff..e76a5afacfa 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.vscode-extensions-prod
@@ -17,7 +17,7 @@
pipeline {
agent {
docker {
- image 'quay.io/kie-tools/kie-tools-ci-build:latest'
+ image 'docker.io/apache/incubator-kie-tools-ci-build:main'
args '--shm-size=2g --privileged --group-add docker'
}
}
diff --git a/.ci/jenkins/shared-scripts/dockerUtils.groovy
b/.ci/jenkins/shared-scripts/dockerUtils.groovy
index b7377d78ff7..3767ae75221 100644
--- a/.ci/jenkins/shared-scripts/dockerUtils.groovy
+++ b/.ci/jenkins/shared-scripts/dockerUtils.groovy
@@ -18,28 +18,32 @@
/**
* Push an image to a given registry
*/
-def pushImageToRegistry(String registry, String image, String tags, String
credentialsId) {
- withCredentials([usernamePassword(credentialsId: credentialsId,
usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
- sh "set +x && docker login -u $REGISTRY_USER -p $REGISTRY_PWD
$registry"
- tagList = tags.split(' ')
- for (tag in tagList) {
- sh "docker push $registry/$image:$tag"
+def pushImageToRegistry(String registry, String image, String tags, String
userCredentialsId, String tokenCredentialsId) {
+ withCredentials([string(credentialsId: userCredentialsId, variable:
'DOCKER_USER')]) {
+ withCredentials([string(credentialsId: tokenCredentialsId, variable:
'DOCKER_TOKEN')]) {
+ sh "set +x && docker login -u $DOCKER_USER -p $DOCKER_TOKEN
$registry"
+ tagList = tags.split(' ')
+ for (tag in tagList) {
+ sh "docker push $registry/$image:$tag"
+ }
+ sh 'docker logout'
}
- sh 'docker logout'
}
}
/**
* @return bool image exists in a given registry
*/
-def checkImageExistsInRegistry(String registry, String image, String tag,
String credentialsId) {
- withCredentials([usernamePassword(credentialsId: credentialsId,
usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PWD')]) {
- sh "set +x && docker login -u $REGISTRY_USER -p $REGISTRY_PWD
$registry"
- result = sh returnStatus: true, script: """
- docker manifest inspect $registry/$image:$tag > /dev/null 2>&1
- """.trim()
- sh 'docker logout'
- return result == 0
+def checkImageExistsInRegistry(String registry, String image, String tag,
String userCredentialsId, String tokenCredentialsId) {
+ withCredentials([string(credentialsId: userCredentialsId, variable:
'DOCKER_USER')]) {
+ withCredentials([string(credentialsId: tokenCredentialsId, variable:
'DOCKER_TOKEN')]) {
+ sh "set +x && docker login -u $DOCKER_USER -p $DOCKER_TOKEN
$registry"
+ result = sh returnStatus: true, script: """
+ docker manifest inspect $registry/$image:$tag > /dev/null 2>&1
+ """.trim()
+ sh 'docker logout'
+ return result == 0
+ }
}
}
diff --git a/.ci/jenkins/shared-scripts/pipelineVars.groovy
b/.ci/jenkins/shared-scripts/pipelineVars.groovy
index d1945a7e26f..eeaa6096e01 100644
--- a/.ci/jenkins/shared-scripts/pipelineVars.groovy
+++ b/.ci/jenkins/shared-scripts/pipelineVars.groovy
@@ -20,7 +20,8 @@ class PipelineVars implements Serializable {
String githubRepositoryName = 'incubator-kie-tools'
String githubRepositorySlug = 'apache/incubator-kie-tools'
String quayPushCredentialsId = 'quay-io-kie-tools-token'
- String dockerHubApacheKiePushCredentialsId =
'dockerhub_apache_kie_registry_token'
+ String dockerHubUserCredentialsId = 'DOCKERHUB_USER'
+ String dockerHubTokenCredentialsId = 'DOCKERHUB_TOKEN'
String openshiftCredentialsId = 'openshift-kie-tools-token'
String kieToolsBotGithubCredentialsId = 'kie-tools-bot-gh'
String kieToolsBotGithubTokenCredentialsId = 'kie-tools-bot-gh-token'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
