From dcedd421287436f9797c7a91ee40904193b1d5fa Mon Sep 17 00:00:00 2001 From: Tristan Radisson Date: Wed, 16 Aug 2023 16:12:19 +0200 Subject: [PATCH] Revert "CI: Deactive kie-jpmml-integration checks (#5469)" This reverts commit 46b383c658095aed86544239a79142a2ba6e4aa0. --- .ci/buildchain-config.yaml | 14 +++++++------- .ci/buildchain-project-dependencies.yaml | 8 ++++---- .ci/jenkins/dsl/jobs.groovy | 6 +++--- .github/workflows/pr-downstream.yml | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.ci/buildchain-config.yaml b/.ci/buildchain-config.yaml index d1d2a3275db..b52583836ef 100644 --- a/.ci/buildchain-config.yaml +++ b/.ci/buildchain-config.yaml @@ -68,10 +68,10 @@ build: upstream: | mvn clean install -Dquickly ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KOGITO_EXAMPLES_BUILD_MVN_OPTS_UPSTREAM }} - # - project: kiegroup/kie-jpmml-integration - # build-command: - # current: | - # export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KIE_JPMML_INTEGRATION_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` - # mvn clean ${{ env.MVN_CMD }} ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_CURRENT }} ${{ env.KIE_JPMML_INTEGRATION_BUILD_MVN_OPTS }} - # upstream: | - # mvn clean install -DskipTests ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KIE_JPMML_INTEGRATION_BUILD_MVN_OPTS_UPSTREAM }} \ No newline at end of file + - project: kiegroup/kie-jpmml-integration + build-command: + current: | + export MVN_CMD=`bash -c "if [ '${{ env.ENABLE_DEPLOY }}' = 'true' ]; then printf 'deploy ${{ env.DEPLOY_MVN_OPTS }} ${{ env.KIE_JPMML_INTEGRATION_DEPLOY_MVN_OPTS }}'; else printf 'install'; fi"` + mvn clean ${{ env.MVN_CMD }} ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_CURRENT }} ${{ env.KIE_JPMML_INTEGRATION_BUILD_MVN_OPTS }} + upstream: | + mvn clean install -DskipTests ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }} ${{ env.KIE_JPMML_INTEGRATION_BUILD_MVN_OPTS_UPSTREAM }} \ No newline at end of file diff --git a/.ci/buildchain-project-dependencies.yaml b/.ci/buildchain-project-dependencies.yaml index a6ccd42bd13..df8f8ebcdcb 100644 --- a/.ci/buildchain-project-dependencies.yaml +++ b/.ci/buildchain-project-dependencies.yaml @@ -60,7 +60,7 @@ dependencies: - kiegroup/kogito-apps - kiegroup/kogito-runtimes - # - project: kiegroup/kie-jpmml-integration - # dependencies: - # - project: kiegroup/drools - # # no mapping needed + - project: kiegroup/kie-jpmml-integration + dependencies: + - project: kiegroup/drools + # no mapping needed diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 495da701c02..8a94e35b71a 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -177,9 +177,9 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) { env : [ KOGITO_EXAMPLES_SUBFOLDER_POM: 'serverless-workflow-examples/', ], - // ], [ - // id: 'kie-jpmml-integration', - // repository: 'kie-jpmml-integration' + ], [ + id: 'kie-jpmml-integration', + repository: 'kie-jpmml-integration' ] ] ] diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index ab4785cd49a..e412502a418 100644 --- a/.github/workflows/pr-downstream.yml +++ b/.github/workflows/pr-downstream.yml @@ -20,7 +20,7 @@ jobs: timeout-minutes: 180 strategy: matrix: - job_name: [ kogito-runtimes, kogito-apps, kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ] + job_name: [ kogito-runtimes, kogito-apps, kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples, kie-jpmml-integration ] os: [ubuntu-latest] java-version: [11] maven-version: ['3.8.7'] @@ -39,8 +39,8 @@ jobs: - job_name: serverless-workflow-examples repository: kogito-examples env_KOGITO_EXAMPLES_SUBFOLDER_POM: serverless-workflow-examples/ - # - job_name: kie-jpmml-integration - # repository: kie-jpmml-integration + - job_name: kie-jpmml-integration + repository: kie-jpmml-integration fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.job_name }} (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }})