chore: Use unique artifact names in Java test run (apache#1818)

Author: andygrove

.github/actions/java-test/action.yaml

@@ -18,8 +18,11 @@
 name: "Java Test"
 description: "Run Java tests"
 inputs:
+  artifact_name:
+    description: "Unique name for uploaded artifacts for this run"
+    required: true
   suites:
-    description: 'Which test suites to run'
+    description: 'Which Scalatest test suites to run'
     required: false
     default: ''
   maven_opts:
@@ -79,7 +82,7 @@ runs:
       if: failure()
       uses: actions/upload-artifact@v4
       with:
-        name: crash-logs-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+        name: crash-logs-${{ inputs.artifact_name }}
         path: "**/hs_err_pid*.log"
     - name: Debug listing
       if: failure()
@@ -93,13 +96,13 @@ runs:
       if: failure()
       uses: actions/upload-artifact@v4
       with:
-        name: unit-tests-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+        name: unit-tests-${{ inputs.artifact_name }}
         path: "**/target/unit-tests.log"
     - name: Upload test results
       if: ${{ inputs.upload-test-reports == 'true' }}
       uses: actions/upload-artifact@v4
       with:
-         name: java-test-reports-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
+         name: java-test-reports-${{ inputs.artifact_name }}
          path: "**/target/surefire-reports/*.txt"
          retention-days: 7 # 1 week for test reports
          overwrite: true

.github/workflows/pr_build_linux.yml

@@ -159,6 +159,7 @@ jobs:
       - name: Java test steps
         uses: ./.github/actions/java-test
         with:
+          artifact_name: ${{ matrix.os }}-${{ matrix.profile.name }}-${{ matrix.suite.name }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
           suites: ${{ matrix.suite.value }}
           maven_opts: ${{ matrix.profile.maven_opts }}
           scan_impl: ${{ matrix.profile.scan_impl }}

.github/workflows/pr_build_macos.yml

@@ -44,9 +44,23 @@ jobs:
   macos-aarch64-test:
     strategy:
       matrix:
-        java_version: [17]
-        spark-version: ['3.4', '3.5', '4.0']
-        scala-version: ['2.13']
+        os: [macos-14]
+
+        # the goal with these profiles is to get coverage of all Java, Scala, and Spark
+        # versions without testing all possible combinations, which would be overkill
+        profile:
+          - name: "Spark 3.4, JDK 11, Scala 2.12"
+            java_version: "11"
+            maven_opts: "-Pspark-3.4 -Pscala-2.12"
+
+          - name: "Spark 3.5, JDK 17, Scala 2.13"
+            java_version: "17"
+            maven_opts: "-Pspark-3.5 -Pscala-2.13"
+
+          - name: "Spark 4.0, JDK 17, Scala 2.13"
+            java_version: "17"
+            maven_opts: "-Pspark-4.0 -Pscala-2.13"
+
         suite:
           - name: "fuzz"
             value: |
@@ -94,19 +108,20 @@ jobs:
               org.apache.spark.sql.comet.CometTPCDSV2_7_PlanStabilitySuite
               org.apache.spark.sql.comet.CometTaskMetricsSuite
       fail-fast: false
-    name: macos-14(Silicon)/ ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}} [${{matrix.suite.name}}]
-    runs-on: macos-14
+    name: ${{ matrix.os }}/${{ matrix.profile.name }} [${{ matrix.suite.name }}]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust & Java toolchain
         uses: ./.github/actions/setup-macos-builder
         with:
           rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
+          jdk-version: ${{ matrix.profile.java_version }}
           jdk-architecture: aarch64
           protoc-architecture: aarch_64
       - name: Java test steps
         uses: ./.github/actions/java-test
         with:
+          artifact_name: ${{ matrix.os }}-${{ matrix.profile.name }}-${{ matrix.suite.name }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
           suites: ${{ matrix.suite.value }}
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
+          maven_opts: ${{ matrix.profile.maven_opts }}