NO-ISSUE: Adjust Release jobs for all branches (apache#2433)

tiagobento · Jun 18, 2024 · 3cc3182 · 3cc3182
1 parent c787ed0
commit 3cc3182
Show file tree

Hide file tree

Showing 16 changed files with 78 additions and 176 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
                         }
                     }
                 }