KOGITO-8667 Reorganize GHA (apache#1631)

* KOGITO-8667 Reorganize GHA * Update .github/workflows/pr-downstream.yml
rgdoliveira · Feb 16, 2023 · 64e4266 · 64e4266
1 parent 6ec11f7
commit 64e4266
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/kogito-examples-pr.yml → .github/workflows/pr-downstream.yml b/.github/workflows/kogito-examples-pr.yml → .github/workflows/pr-downstream.yml
@@ -1,4 +1,4 @@
-name: Kogito Examples Build
+name: Kogito Downstream
 
 on:
   pull_request:
@@ -13,23 +13,30 @@ on:
       - '.ci/jenkins/**'
 
 jobs:
-  example-build:
+  kogito-downstream-build:
     concurrency:
-      group: ${{ matrix.examples-subfolder }}-pr-${{ github.head_ref }}
+      group: pr-${{ matrix.job_name }}_${{ matrix.os }}_${{ matrix.java-version }}_${{ matrix.maven-version }}_${{ github.head_ref }}
       cancel-in-progress: true
     timeout-minutes: 180
     strategy:
       matrix:
+        job_name: [ kogito-quarkus-examples, kogito-springboot-examples, serverless-workflow-examples ]
         os: [ubuntu-latest]
         java-version: [11]
         maven-version: ['3.8.7']
-        examples-subfolder:
-          - kogito-quarkus-examples
-          - kogito-springboot-examples
-          - serverless-workflow-examples
+        include:
+          - 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/
       fail-fast: false
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }} - Java ${{ matrix.java-version }} - ${{ matrix.examples-subfolder }}
+    name: ${{ matrix.job_name }} (${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }})
     steps:
       - name: Clean Disk Space
         uses: kiegroup/kogito-pipelines/.ci/actions/ubuntu-disk-space@main
@@ -45,14 +52,14 @@ jobs:
           cache-key-prefix: ${{ runner.os }}-${{ matrix.java-version }}-maven${{ matrix.maven-version }}
       - name: Build Chain
         uses: kiegroup/kogito-pipelines/.ci/actions/build-chain@main
-        env:
-          KOGITO_EXAMPLES_SUBFOLDER_POM: ${{ matrix.examples-subfolder }}/
         with:
           annotations-prefix: ${{ runner.os }}-${{ matrix.java-version }}/${{ matrix.maven-version }}
-          starting-project: kiegroup/kogito-examples
+          starting-project: kiegroup/${{ matrix.repository }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
+        env: 
+          KOGITO_EXAMPLES_SUBFOLDER_POM: ${{ matrix.env_KOGITO_EXAMPLES_SUBFOLDER_POM }}
       - name: Surefire Report
         uses: kiegroup/kogito-pipelines/.ci/actions/surefire-report@main
         if: ${{ always() }}
         with:
-          report_paths: '**/*-reports/TEST-*.xml'
+          report_paths: '**/*-reports/TEST-*.xml'
diff --git a/.github/workflows/jenkins-tests-PR.yml → .github/workflows/pr-jenkins.yml b/.github/workflows/jenkins-tests-PR.yml → .github/workflows/pr-jenkins.yml
@@ -13,6 +13,7 @@ jobs:
       group: ${{ github.repository.name }}_dsl_tests-${{ github.head_ref }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
+    name: DSL
     steps:
     - name: DSL tests
       uses: kiegroup/kogito-pipelines/.ci/actions/dsl-tests@main

diff --git a/.github/workflows/kogito-apps-pr.yml → .github/workflows/pr-kogito-apps.yml b/.github/workflows/kogito-apps-pr.yml → .github/workflows/pr-kogito-apps.yml
@@ -1,4 +1,4 @@
-name: Kogito Apps Build
+name: Kogito Apps
 
 on:
   pull_request:
@@ -15,7 +15,7 @@ on:
 jobs:
   build-chain:
     concurrency:
-      group: kogito_apps_pr-${{ github.head_ref }}
+      group: pr-kogito-apps_${{ matrix.os }}_${{ matrix.java-version }}_${{ matrix.maven-version }}_${{ github.head_ref }}
       cancel-in-progress: true
     timeout-minutes: 210
     strategy:
@@ -25,7 +25,7 @@ jobs:
         maven-version: ['3.8.7']
       fail-fast: false
     runs-on: ${{ matrix.os }}
-    name: Maven Build
+    name: ${{ matrix.os }} / Java-${{ matrix.java-version }} / Maven-${{ matrix.maven-version }}
     steps:
       - name: Clean Disk Space
         uses: kiegroup/kogito-pipelines/.ci/actions/ubuntu-disk-space@main