ci: clean up sdk-platform-java test names

Author: chingor13

.github/workflows/sdk-platform-java-ci.yaml

@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: sdk-platform-java-ci
+name: sdk-platform-java
 jobs:
   filter:
     runs-on: ubuntu-latest
@@ -18,8 +18,8 @@ jobs:
           library:
             - 'sdk-platform-java/**'
             - 'google-auth-library-java/**'
-            - '.github/workflows/ci.yaml'
-  build:
+            - '.github/workflows/sdk-platform-java-ci.yaml'
+  sdk-platform-java:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
     runs-on: ubuntu-22.04
@@ -79,58 +79,20 @@ jobs:
           pushd /tmp/java-compute/google-cloud-compute-small-v1-java
           ./gradlew clean build publishToMavenLocal sourcesJar allJars
           popd
-  build-java-21:
+  build-java-21-25:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
-    name: "build(21) except self-service clients"
+    name: "sdk-platform-java except self-service clients"
     # Support for Java 21 is available for all use cases except self-service clients.
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        java: [ 21, 25 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
-          distribution: temurin
-          cache: maven
-      - run: java -version
-      - name: Unit Tests
-        shell: bash
-        run: .kokoro/build.sh
-        env:
-          BUILD_SUBDIR: sdk-platform-java
-          JOB_TYPE: test
-      # The `envVarTest` profile runs tests that require an environment variable
-      - name: Env Var Tests
-        shell: bash
-        run: .kokoro/build.sh
-        env:
-          BUILD_SUBDIR: sdk-platform-java
-          JOB_TYPE: test
-          SUREFIRE_JVM_OPT: '-PenvVarTest'
-          GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
-          GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
-          GOOGLE_SDK_JAVA_LOGGING: true
-      - run: bazelisk version
-      - name: Install all modules using Java 11
-        shell: bash
-        run: .kokoro/build.sh
-        env:
-          BUILD_SUBDIR: sdk-platform-java
-          JOB_TYPE: install
-      - name: Integration Tests
-        run: |
-          bazelisk --batch test //sdk-platform-java/test/integration/...
-  build-java-25:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
-    name: "build(25) except self-service clients"
-    # Support for Java 25 is available for all use cases except self-service clients.
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          java-version: 25
+          java-version: ${{ matrix.java }}
           distribution: temurin
           cache: maven
       - run: java -version
@@ -152,20 +114,23 @@ jobs:
           GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
           GOOGLE_SDK_JAVA_LOGGING: true
       - run: bazelisk version
-      - name: Install all modules using Java 11
+      - name: Install all modules
         shell: bash
         run: .kokoro/build.sh
         env:
           BUILD_SUBDIR: sdk-platform-java
           JOB_TYPE: install
+      - name: Conditionally set jvmopts
+        if: ${{ matrix.java == 25 }}
+        run: echo "EXTRA_BAZEL_ARGS='--jvmopt=-Dcom.google.testing.junit.runner.shouldInstallTestSecurityManager=false'" >> $GITHUB_ENV
       - name: Integration Tests
-        # note need to set shouldInstallTestSecurityManager=false due to https://github.com/bazelbuild/bazel/issues/24354
         run: |
-          bazelisk --batch test //sdk-platform-java/test/integration/... --jvmopt=-Dcom.google.testing.junit.runner.shouldInstallTestSecurityManager=false
-  build-java8-except-gapic-generator-java:
+          bazelisk --batch test //sdk-platform-java/test/integration/... ${EXTRA_BAZEL_ARGS}
+
+  sdk-platform-java-8:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
-    name: "build(8) except for gapic-generator-java"
+    name: "sdk-platform-java except gapic-generator-java (8)"
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -217,10 +182,10 @@ jobs:
           GOOGLE_SDK_JAVA_LOGGING: true
         working-directory: sdk-platform-java
 
-  build-java8-gapic-generator-java:
+  gapic-generator-java:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
-    name: "build(8) for gapic-generator-java"
+    name: "gapic-generator-java (8)"
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4