KOGITO-5386: added a new parameter for unique branch name

apache · Aug 8, 2023 · 6f1f5e7 · 6f1f5e7
1 parent cce9bca
commit 6f1f5e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.release.artifacts b/.ci/jenkins/Jenkinsfile.release.artifacts
@@ -355,6 +355,7 @@ List getDefaultBuildParams(String version) {
     List buildParams = []
     addDisplayNameParam(buildParams, getDisplayName(version))
     addStringParam(buildParams, 'PROJECT_VERSION', version)
+    addStringParam(buildParams, 'KOGITO_PR_BRANCH', "kogito-${version}")
     return buildParams
 }
 

diff --git a/.ci/jenkins/Jenkinsfile.release.cloud b/.ci/jenkins/Jenkinsfile.release.cloud
@@ -24,6 +24,8 @@ examplesImagesParamsPrefix = 'EXAMPLES_IMAGES'
 baseImageParamsPrefix = 'BASE_IMAGE'
 promoteImageParamsPrefix = 'PROMOTE_IMAGE'
 
+kogitoPrBranch = "${KOGITO_PR_BRANCH?.trim() ?: "kogito-${version}"}"
+
 pipeline {
     agent {
         label 'kie-rhel8 && !built-in'
@@ -39,6 +41,8 @@ pipeline {
         KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
 
         IMAGE_NAME_NIGHTLY_SUFFIX = 'nightly'
+
+        PR_BRANCH_HASH = "${util.generateHash(10)}"
     }
 
     stages {
@@ -425,6 +429,9 @@ List getDefaultBuildParams(String version) {
     List buildParams = []
     addDisplayNameParam(buildParams, getDisplayName(version))
     addStringParam(buildParams, 'PROJECT_VERSION', version)
+    if ( kogitoPrBranch == '' ) {
+        addStringParam(buildParams, 'KOGITO_PR_BRANCH', "${kogitoPrBranch}")
+    }
     return buildParams
 }