From 6ec5bf0bf1559f8169aa719d34641f116a644374 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 24 Jul 2023 09:25:35 +0200
Subject: [PATCH 1/2] 9.x: Fix CI

---
 .ci/jenkins/Jenkinsfile.setup-branch |  6 +++++-
 .ci/jenkins/dsl/jobs.groovy          | 32 +++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 2827afc10e3..e00cc151829 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -78,7 +78,7 @@ pipeline {
         }
         stage('Update Drools version in kie-benchmarks') {
             when {
-                expression { isMainBranch() }
+                expression { isStream8() && isMainBranch() }
             }
             steps {
                 script {
@@ -157,3 +157,7 @@ void mergeAndPush(String prLink, String targetBranch) {
         githubscm.pushObject('origin', targetBranch, getGitAuthorCredsId())
     }
 }
+
+boolean isStream8() {
+    return env.DROOLS_STREAM == '8'
+}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 29e67821c01..2ed43ffd948 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -18,6 +18,21 @@ import org.kie.jenkins.jobdsl.Utils
 
 jenkins_path = '.ci/jenkins'
 
+boolean isStream8() {
+    return getDroolsStream() == '8'
+}
+
+String getDroolsStream() {
+    String gitMainBranch = "${GIT_MAIN_BRANCH}"
+    if (gitMainBranch == 'main') {
+        return '8'
+    } else if (gitMainBranch == '9.x') {
+        return '9'
+    } else {
+        return gitMainBranch
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 // Whole Drools project jobs
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -48,7 +63,8 @@ void createProjectSetupBranchJob() {
 
         GIT_BRANCH_NAME: "${GIT_BRANCH}",
 
-        IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}"
+        IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}",
+        DROOLS_STREAM: getDroolsStream(),
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
@@ -65,6 +81,8 @@ void setupProjectNightlyJob() {
         JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
 
         GIT_BRANCH_NAME: "${GIT_BRANCH}",
+        
+        DROOLS_STREAM: getDroolsStream(),
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
@@ -83,6 +101,8 @@ void setupProjectReleaseJob() {
 
         DEFAULT_STAGING_REPOSITORY: "${MAVEN_NEXUS_STAGING_PROFILE_URL}",
         ARTIFACTS_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+        
+        DROOLS_STREAM: getDroolsStream(),
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
@@ -104,7 +124,8 @@ void setupProjectPostReleaseJob() {
         GIT_BRANCH_NAME: "${GIT_BRANCH}",
         GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
         AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
-
+        
+        DROOLS_STREAM: getDroolsStream(),
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
@@ -241,7 +262,8 @@ void createSetupBranchJob() {
 
         MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
 
-        IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}"
+        IS_MAIN_BRANCH: "${Utils.isMainBranch(this)}",
+        DROOLS_STREAM: getDroolsStream(),
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {
@@ -271,6 +293,8 @@ void setupDeployJob(JobType jobType) {
         MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
         MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
         MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+        
+        DROOLS_STREAM: getDroolsStream(),
     ])
     if (jobType == JobType.RELEASE) {
         jobParams.env.putAll([
@@ -311,6 +335,8 @@ void setupPromoteJob(JobType jobType) {
         MAVEN_SETTINGS_CONFIG_FILE_ID: "${MAVEN_SETTINGS_FILE_ID}",
         MAVEN_DEPENDENCIES_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
         MAVEN_DEPLOY_REPOSITORY: "${MAVEN_ARTIFACTS_REPOSITORY}",
+
+        DROOLS_STREAM: getDroolsStream(),
     ])
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {

From d0e7eb4738c1d21bfd83b7e9c703a0494b414783 Mon Sep 17 00:00:00 2001
From: Tristan Radisson <tristan.radisson@gmail.com>
Date: Mon, 24 Jul 2023 13:43:25 +0200
Subject: [PATCH 2/2] Review comments

---
 .ci/jenkins/dsl/jobs.groovy | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 2ed43ffd948..df99a480baf 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -18,18 +18,12 @@ import org.kie.jenkins.jobdsl.Utils
 
 jenkins_path = '.ci/jenkins'
 
-boolean isStream8() {
-    return getDroolsStream() == '8'
-}
-
 String getDroolsStream() {
     String gitMainBranch = "${GIT_MAIN_BRANCH}"
     if (gitMainBranch == 'main') {
         return '8'
-    } else if (gitMainBranch == '9.x') {
-        return '9'
     } else {
-        return gitMainBranch
+        return gitMainBranch.split("\\.")[0]
     }
 }