regroup sdk-platform-java tests

Author: chingor13

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

@@ -19,13 +19,14 @@ jobs:
             - 'sdk-platform-java/**'
             - 'google-auth-library-java/**'
             - '.github/workflows/sdk-platform-java-ci.yaml'
-  sdk-platform-java:
+  units:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
     runs-on: ubuntu-22.04
+    name: sdk-platform-java units
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 11, 17, 21, 25 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -51,86 +52,11 @@ jobs:
           GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
           GOOGLE_SDK_JAVA_LOGGING: true
         working-directory: sdk-platform-java
-      - 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/...
-      - name: Gradle Build Generated Storage Client Library
-        run: |
-          echo "Building Storage lib from generated source..."
-          mkdir /tmp/java-storage
-          bazelisk --batch build @com_google_googleapis//google/storage/v2:google-cloud-storage-v2-java
-          tar zxvf bazel-bin/external/com_google_googleapis/google/storage/v2/google-cloud-storage-v2-java.tar.gz -C /tmp/java-storage
-          pushd /tmp/java-storage/google-cloud-storage-v2-java
-          ./gradlew clean build publishToMavenLocal sourcesJar allJars
-          popd
-      - name: Gradle Build Generated Compute Client Library
-        run: |
-          echo "Building Compute lib from generated source..."
-          mkdir /tmp/java-compute
-          bazelisk --batch build @com_google_googleapis//google/cloud/compute/v1small:google-cloud-compute-small-v1-java
-          tar zxvf bazel-bin/external/com_google_googleapis/google/cloud/compute/v1small/google-cloud-compute-small-v1-java.tar.gz -C /tmp/java-compute
-          pushd /tmp/java-compute/google-cloud-compute-small-v1-java
-          ./gradlew clean build publishToMavenLocal sourcesJar allJars
-          popd
-  build-java-21-25:
-    needs: filter
-    if: ${{ needs.filter.outputs.library == 'true' }}
-    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: ${{ matrix.java }}
-          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
-        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
-        run: |
-          bazelisk --batch test //sdk-platform-java/test/integration/... "${EXTRA_BAZEL_ARGS[@]}"
 
   sdk-platform-java-8:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
-    name: "sdk-platform-java except gapic-generator-java (8)"
+    name: "sdk-platform-java units (8)"
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -182,6 +108,79 @@ jobs:
           GOOGLE_SDK_JAVA_LOGGING: true
         working-directory: sdk-platform-java
 
+  bazel:  
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-22.04
+    name: sdk-platform-java integration
+    strategy:
+      matrix:
+        java: [ 11, 17, 21 ]
+    steps:
+      - 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/...
+
+  bazel-25:  
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-22.04
+    name: sdk-platform-java integration (25)
+    steps:
+      - 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/... --jvmopt=-Dcom.google.testing.junit.runner.shouldInstallTestSecurityManager=false
+
+  self-service:
+    needs: filter
+    if: ${{ needs.filter.outputs.library == 'true' }}
+    runs-on: ubuntu-22.04
+    name: sdk-platform-java integration
+    strategy:
+      matrix:
+        java: [ 11, 17 ]
+    steps:
+      - 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: Gradle Build Generated Storage Client Library
+        run: |
+          echo "Building Storage lib from generated source..."
+          mkdir /tmp/java-storage
+          bazelisk --batch build @com_google_googleapis//google/storage/v2:google-cloud-storage-v2-java
+          tar zxvf bazel-bin/external/com_google_googleapis/google/storage/v2/google-cloud-storage-v2-java.tar.gz -C /tmp/java-storage
+          pushd /tmp/java-storage/google-cloud-storage-v2-java
+          ./gradlew clean build publishToMavenLocal sourcesJar allJars
+          popd
+      - name: Gradle Build Generated Compute Client Library
+        run: |
+          echo "Building Compute lib from generated source..."
+          mkdir /tmp/java-compute
+          bazelisk --batch build @com_google_googleapis//google/cloud/compute/v1small:google-cloud-compute-small-v1-java
+          tar zxvf bazel-bin/external/com_google_googleapis/google/cloud/compute/v1small/google-cloud-compute-small-v1-java.tar.gz -C /tmp/java-compute
+          pushd /tmp/java-compute/google-cloud-compute-small-v1-java
+          ./gradlew clean build publishToMavenLocal sourcesJar allJars
+          popd
+
+
   gapic-generator-java:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}