kie-issues#423: 9.x: Remove build-chain patch

apache · Aug 16, 2023 · 0469651 · 0469651
1 parent fe73ad5
commit 0469651
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 348 deletions.
diff --git a/.ci/environments/quarkus-3/patches/1000_ci_updates.patch b/.ci/environments/quarkus-3/patches/1000_ci_updates.patch
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
@@ -262,7 +262,7 @@ MavenCommand getMavenCommand(String directory = '') {
     def mvnCmd = new MavenCommand(this, ['-fae', '-ntp'])
                 .withSettingsXmlId(env.MAVEN_SETTINGS_CONFIG_FILE_ID)
                 .inDirectory(directory)
-    if (!isStream8()) { // Workaround as enforcer rules may not be fixed on other streams
+    if (!isMainStream()) { // Workaround as enforcer rules may not be fixed on other streams
         mvnCmd.withProperty('enforcer.skip')
     } else {
         mvnCmd.withProperty('full')
@@ -298,6 +298,6 @@ String getLocalDeploymentFolder() {
     return "${env.MAVEN_DEPLOY_LOCAL_DIR}/${getRepoName()}"
 }
 
-boolean isStream8() {
-    return env.DROOLS_STREAM == '8'
+boolean isMainStream() {
+    return env.DROOLS_STREAM == 'main'
 }
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
@@ -71,7 +71,7 @@ pipeline {
 
         stage('Upload drools binaries and documentation') {
             when {
-                expression { return isStream8() }
+                expression { return isMainStream() }
             }
             steps {
                 script {
@@ -218,6 +218,6 @@ boolean isNotTestingBuild() {
     return getGitAuthor() == 'kiegroup'
 }
 
-boolean isStream8() {
-    return env.DROOLS_STREAM == '8'
+boolean isMainStream() {
+    return env.DROOLS_STREAM == 'main'
 }
diff --git 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 { isStream8() && isMainBranch() }
+                expression { isMainStream() && isMainBranch() }
             }
             steps {
                 script {
@@ -158,6 +158,6 @@ void mergeAndPush(String prLink, String targetBranch) {
     }
 }
 
-boolean isStream8() {
-    return env.DROOLS_STREAM == '8'
+boolean isMainStream() {
+    return env.DROOLS_STREAM == 'main'
 }