From ab32c489ccd646918da03327673b6b031a692390 Mon Sep 17 00:00:00 2001 From: Tristan Radisson Date: Fri, 25 Aug 2023 11:32:01 +0200 Subject: [PATCH] Revert "Quarkus 3: Disable `kie-jpmml-integration` calls (#5489)" This reverts commit 977bcfb1c64172433c9b0f01c55d23680a9e2277. --- .ci/jenkins/project/Jenkinsfile.nightly | 7 ------- .ci/jenkins/project/Jenkinsfile.release | 9 +-------- .ci/jenkins/project/Jenkinsfile.setup-branch | 7 ------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/.ci/jenkins/project/Jenkinsfile.nightly b/.ci/jenkins/project/Jenkinsfile.nightly index ea098f73ece..a03ad66e849 100644 --- 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 index b92ee124407..6db923a0b74 100644 --- 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 index 512d85b2eb4..8a2cd653d73 100644 --- 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' -}