try matrix unit tests

locationtech · Nov 11, 2024 · fb41744 · fb41744
1 parent 96fc366
commit fb41744
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 108 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -48,113 +48,51 @@ jobs:
       - name: Remove geomesa artifacts
         if: success() || failure()
         run: rm -rf ~/.m2/repository/org/locationtech/geomesa
-  unit-test-accumulo-ds:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -pl :geomesa-accumulo-datastore_${{ inputs.scala-version }}
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-accumulo-other:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-accumulo -pl -:geomesa-accumulo-datastore_${{ inputs.scala-version }}
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-arrow:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-arrow
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-cassandra:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-cassandra
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-convert:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-convert
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-cqengine:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-memory
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-features:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-features
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-fs:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-fs
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-gt:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-gt
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-hbase:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-hbase
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-kafka:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-kafka
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-lambda:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-lambda
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-metrics:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-metrics
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-process:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-process
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-redis:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-redis
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-spark:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-spark
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-utils:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -f geomesa-utils-parent
-      scala-version: ${{ inputs.scala-version }}
-  unit-test-others:
-    needs: compile
-    uses: ./.github/workflows/unit-tests.yml
-    with:
-      module-selector: -pl geomesa-filter,geomesa-index-api,geomesa-jobs,geomesa-security,geomesa-tools,geomesa-z3
+  unit-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        tests:
+          - name: accumulo-ds
+            selector: -pl :geomesa-accumulo-datastore_${{ inputs.scala-version }}
+          - name: accumulo-other
+            selector: -f geomesa-accumulo -pl -:geomesa-accumulo-datastore_${{ inputs.scala-version }}
+          - name: arrow
+            selector: -f geomesa-arrow
+          - name: cassandra
+            selector: -f geomesa-cassandra
+          - name: convert
+            selector: -f geomesa-convert
+          - name: cqengine
+            selector: -f geomesa-memory
+          - name: features
+            selector: -f geomesa-features
+          - name: fs
+            selector: -f geomesa-fs
+          - name: gt
+            selector: -f geomesa-gt
+          - name: hbase
+            selector: -f geomesa-hbase
+          - name: kafka
+            selector: -f geomesa-kafka
+          - name: lambda
+            selector: -f geomesa-lambda
+          - name: metrics
+            selector: -f geomesa-metrics
+          - name: process
+            selector: -f geomesa-process
+          - name: redis
+            selector: -f geomesa-redis
+          - name: spark
+            selector: -f geomesa-spark
+          - name: utils
+            selector: -f geomesa-utils-parent
+          - name: others
+            selector: -pl geomesa-filter,geomesa-index-api,geomesa-jobs,geomesa-security,geomesa-tools,geomesa-z3
+    needs: compile
+    uses: ./.github/workflows/unit-tests.yml
+    with:
+      module-selector: ${{ matrix.tests.selector }}
       scala-version: ${{ inputs.scala-version }}
   integration-tests:
     needs: compile

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -10,6 +10,9 @@ on:
       module-selector:
         required: true
         type: string
+      display-name:
+        required: true
+        type: string
 
 permissions:  # added using https://github.com/step-security/secure-repo
   contents: read
@@ -18,7 +21,7 @@ env:
   MAVEN_CLI_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dlicense.skip=true -Dtest.fork.count=1 --batch-mode
 
 jobs:
-  unit-tests:
+  test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1