Revert "Quarkus 3: Disable kie-jpmml-integration calls (#5489)"

This reverts commit 977bcfb.
apache · Aug 25, 2023 · ab32c48 · ab32c48
1 parent 977bcfb
commit ab32c48
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 22 deletions.
diff --git a/.ci/jenkins/project/Jenkinsfile.nightly b/.ci/jenkins/project/Jenkinsfile.nightly
@@ -61,9 +61,6 @@ pipeline {
             }
         }
         stage('Build & Deploy KIE jpmml integration') {
-            when {
-                expression { return isMainStream() }
-            }
             steps {
                 script {
                     def buildParams = getDefaultBuildParams()
@@ -172,7 +169,3 @@ void addBooleanParam(List buildParams, String key, boolean value) {
 String getBuildBranch() {
     return env.GIT_BRANCH_NAME
 }
-
-boolean isMainStream() {
-    return env.STREAM == 'main'
-}
diff --git a/.ci/jenkins/project/Jenkinsfile.release b/.ci/jenkins/project/Jenkinsfile.release
@@ -73,9 +73,6 @@ pipeline {
         }
 
         stage('Build & Deploy KIE jpmml integration') {
-            when {
-                expression { return isMainStream() }
-            }
             steps {
                 script {
                     def buildParams = getDefaultBuildParams()
@@ -131,7 +128,7 @@ pipeline {
 
         stage('Promote KIE jpmml integration') {
             when {
-                expression { return isMainStream() && isJobConsideredOk(getDeployJobName(kieJpmmlIntegrationRepo)) }
+                expression { return isJobConsideredOk(getDeployJobName(kieJpmmlIntegrationRepo)) }
             }
             steps {
                 script {
@@ -410,7 +407,3 @@ boolean areArtifactsReleased() {
 void setArtifactsReleased() {
     setReleasePropertyIfneeded(ARTIFACTS_RELEASE_STAGE, true)
 }
-
-boolean isMainStream() {
-    return env.STREAM == 'main'
-}
diff --git a/.ci/jenkins/project/Jenkinsfile.setup-branch b/.ci/jenkins/project/Jenkinsfile.setup-branch
@@ -63,9 +63,6 @@ pipeline {
         }
 
         stage('Init KIE jpmml integration') {
-            when {
-                expression { return isMainStream() }
-            }
             steps {
                 script {
                     def buildParams = getDefaultBuildParams()
@@ -197,7 +194,3 @@ String getVersionFromReleaseBranch(String releaseBranch, int microVersion = 0, S
         error 'Cannot parse given branch as a release branch, aka [M].[m].x ...'
     }
 }
-
-boolean isMainStream() {
-    return env.STREAM == 'main'
-}