From 815c60ad9f698316b4f923d1fe771649b683be80 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 4 Apr 2024 09:01:16 +0200 Subject: [PATCH 1/5] Remove kie-jpmml-integration check which is already removed on Drools midstream main --- .github/workflows/pr-downstream.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index 668a5d67de2..eddb400fdbe 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, kie-jpmml-integration ] + job_name: [ kogito-runtimes, kogito-apps, kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ] os: [ubuntu-latest] java-version: [17] maven-version: ['3.9.3'] @@ -39,8 +39,6 @@ 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 fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.job_name }} (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}) From 57cebe4e4a36f3ada68f6141555f8d63bf48613b Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 4 Apr 2024 09:12:05 +0200 Subject: [PATCH 2/5] pr-downstream.yml: remove kogito-quarkus-examples and kogito-springboot-examples that are not part of the product --- .github/workflows/pr-downstream.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index eddb400fdbe..d7ac454e008 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, serverless-workflow-examples ] os: [ubuntu-latest] java-version: [17] maven-version: ['3.9.3'] @@ -30,12 +30,6 @@ jobs: - job_name: kogito-apps repository: kogito-apps env_BUILD_MVN_OPTS: "-DskipUI" - - job_name: kogito-quarkus-examples - repository: kogito-examples - env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-quarkus-examples/ - - job_name: kogito-springboot-examples - repository: kogito-examples - env_KOGITO_EXAMPLES_SUBFOLDER_POM: kogito-springboot-examples/ - job_name: serverless-workflow-examples repository: kogito-examples env_KOGITO_EXAMPLES_SUBFOLDER_POM: serverless-workflow-examples/ From 4f35ae2c1ae257b4e80e8808681f2dd3f3dc6407 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 4 Apr 2024 09:16:12 +0200 Subject: [PATCH 3/5] .ci/buildchain-project-dependencies.yaml: remove Drools / Kogito mapping This mapping is not required anymore as Drools and Kogito are now synced in the same branch/version. This was needed before because the branches used to be Kogito 1.x and Drools 8.x --- .ci/buildchain-project-dependencies.yaml | 54 +----------------------- 1 file changed, 1 insertion(+), 53 deletions(-) diff --git a/.ci/buildchain-project-dependencies.yaml b/.ci/buildchain-project-dependencies.yaml index c009b270225..7ae4e3421c9 100644 --- a/.ci/buildchain-project-dependencies.yaml +++ b/.ci/buildchain-project-dependencies.yaml @@ -1,68 +1,16 @@ version: "2.1" dependencies: - project: kiegroup/drools - mapping: - dependencies: - default: - - source: (\d*)\.(.*) - targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" - dependant: - default: - - source: (\d*)\.(.*) - targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1+7}.${n2}`)" -# exclude: -# - kiegroup/kie-jpmml-integration - project: kiegroup/kogito-runtimes dependencies: - project: kiegroup/drools - mapping: - dependencies: - default: - - source: (\d*)\.(.*) - targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1+7}.${n2}`)" - dependant: - default: - - source: (\d*)\.(.*) - targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" - exclude: - - kiegroup/kogito-examples - - kiegroup/kogito-apps - + - project: kiegroup/kogito-apps dependencies: - project: kiegroup/kogito-runtimes - mapping: - dependencies: - default: - - source: (\d*)\.(.*) - targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1+7}.${n2}`)" - dependant: - default: - - source: (\d*)\.(.*) - targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" - exclude: - - kiegroup/kogito-examples - - kiegroup/kogito-runtimes - project: kiegroup/kogito-examples dependencies: - project: kiegroup/kogito-runtimes - project: kiegroup/kogito-apps - mapping: - dependencies: - default: - - source: (\d*)\.(.*) - targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1+7}.${n2}`)" - dependant: - default: - - source: (\d*)\.(.*) - targetExpression: "process.env.GITHUB_BASE_REF.replace(/(\\d*)\\.(.*)/g, (m, n1, n2) => `${+n1-7}.${n2}`)" - exclude: - - kiegroup/kogito-apps - - kiegroup/kogito-runtimes - - # - project: kiegroup/kie-jpmml-integration - # dependencies: - # - project: kiegroup/drools - # no mapping needed From 51f9dcc493ff48242efad325408dd36353bbc634 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 4 Apr 2024 09:19:14 +0200 Subject: [PATCH 4/5] Remove Drools Ansible intregration check --- .github/workflows/pr-drools-ansible.yml | 49 ------------------------- 1 file changed, 49 deletions(-) delete mode 100644 .github/workflows/pr-drools-ansible.yml diff --git a/.github/workflows/pr-drools-ansible.yml b/.github/workflows/pr-drools-ansible.yml deleted file mode 100644 index e59633d3923..00000000000 --- a/.github/workflows/pr-drools-ansible.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Drools Ansible RuleBook Integration Check - -on: - pull_request: - types: [opened, synchronize, reopened, ready_for_review] - paths-ignore: - - 'LICENSE' - - '**/.gitignore' - - '**.md' - - '**.adoc' - - '*.txt' - - 'docsimg/**' - - '.ci/jenkins/**' - -jobs: - drools-ansible: - concurrency: - group: pr-drools_ansible_${{ matrix.os }}_${{ matrix.java-version }}_${{ matrix.maven-version }}_${{ github.head_ref }} - cancel-in-progress: true - timeout-minutes: 120 - strategy: - matrix: - os: [ubuntu-latest] - java-version: [17] - maven-version: ['3.9.3'] - fail-fast: false - runs-on: ${{ matrix.os }} - name: Ansible Integration / ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }} - steps: - - name: Clean Disk Space - uses: kiegroup/kie-ci/.ci/actions/ubuntu-disk-space@main - if: ${{ matrix.os == 'ubuntu-latest' }} - - name: Support long paths - if: ${{ matrix.os == 'windows-latest' }} - uses: kiegroup/kie-ci/.ci/actions/long-paths@main - - name: Java and Maven Setup - uses: kiegroup/kie-ci/.ci/actions/maven@main - with: - java-version: ${{ matrix.java-version }} - maven-version: ${{ matrix.maven-version }} - cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }} - allow-snapshots: true - - name: Build Chain - uses: kiegroup/kie-ci/.ci/actions/build-chain@main - with: - definition-file: https://raw.githubusercontent.com/${GROUP:kiegroup}/drools-ansible-rulebook-integration/${BRANCH:main}/.ci/pull-request-config.yaml - annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{ matrix.maven-version }} - github-token: "${{ secrets.GITHUB_TOKEN }}" - starting-project: kiegroup/drools-ansible-rulebook-integration \ No newline at end of file From 08092d296a1eaa1a77d5dd5d786dda8aa731dd8b Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Thu, 4 Apr 2024 09:47:35 +0200 Subject: [PATCH 5/5] add -Dproductized profile for Kogito PR check and remove -Dfull profile for Drools PR check The productized profile is still needed as there are still some leftovers of it in upstream code that was not removed yet --- .github/workflows/pr-downstream.yml | 4 +++- .github/workflows/pr-drools.yml | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml index d7ac454e008..8b20fb0f184 100644 --- a/.github/workflows/pr-downstream.yml +++ b/.github/workflows/pr-downstream.yml @@ -27,12 +27,14 @@ jobs: include: - job_name: kogito-runtimes repository: kogito-runtimes + env_BUILD_MVN_OPTS: "-Dproductized" - job_name: kogito-apps repository: kogito-apps - env_BUILD_MVN_OPTS: "-DskipUI" + env_BUILD_MVN_OPTS: "-DskipUI -Dproductized" - job_name: serverless-workflow-examples repository: kogito-examples env_KOGITO_EXAMPLES_SUBFOLDER_POM: serverless-workflow-examples/ + env_BUILD_MVN_OPTS: "-Dproductized" fail-fast: false runs-on: ${{ matrix.os }} name: ${{ matrix.job_name }} (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}) diff --git a/.github/workflows/pr-drools.yml b/.github/workflows/pr-drools.yml index a70d116a641..80fdfc07ee6 100644 --- a/.github/workflows/pr-drools.yml +++ b/.github/workflows/pr-drools.yml @@ -41,8 +41,6 @@ jobs: cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }} - name: Build Chain uses: kiegroup/kie-ci/.ci/actions/build-chain@main - env: - BUILD_MVN_OPTS_CURRENT: -Dfull with: definition-file: https://raw.githubusercontent.com/${GROUP:kiegroup}/drools/${BRANCH:main}/.ci/buildchain-config.yaml annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{ matrix.maven-version }}