Try fixing windows java ea pipelines

Author: breskeby

.buildkite/pipelines/periodic-java-ea.template.yml

@@ -36,7 +36,6 @@ steps:
         matrix:
           setup:
             image:
-              - windows-2025
               - ubuntu-2404
             GRADLE_TASK:
               - checkPart1
@@ -53,6 +52,30 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
+      - label: "{{matrix.GRADLE_TASK}} / {{matrix.image}} "
+        command: |
+          .\.buildkite\scripts\run-script.ps1 bash .buildkite/scripts/windows-run-gradle.sh
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - windows-2025
+            GRADLE_TASK:
+              - checkPart1
+              - checkPart2
+              - checkPart3
+              - checkPart4
+              - checkPart5
+              - checkPart6
+              - checkRestCompat
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: n1-standard-32
+          buildDirectory: /dev/shm/bk
+        env:
+          GRADLE_PARAMS: "-Druntime.java=$$JAVA_EA_VERSION"
+          GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
       - label: "{{matrix.BWC_VERSION}} / matrix-bwc"
         command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION  -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
         timeout_in_minutes: 300

.buildkite/pipelines/periodic-java-ea.yml

@@ -468,13 +468,12 @@ steps:
       buildDirectory: /dev/shm/bk
   - group: java-matrix
     steps:
-      - label: "{{matrix.GRADLE_TASK}} / java-ea"
+      - label: "{{matrix.GRADLE_TASK}} / {{matrix.image}} "
         command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true $$GRADLE_TASK
         timeout_in_minutes: 300
         matrix:
           setup:
             image:
-              - windows-2025
               - ubuntu-2404
             GRADLE_TASK:
               - checkPart1
@@ -491,6 +490,30 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
+      - label: "{{matrix.GRADLE_TASK}} / {{matrix.image}} "
+        command: |
+          .\.buildkite\scripts\run-script.ps1 bash .buildkite/scripts/windows-run-gradle.sh
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - windows-2025
+            GRADLE_TASK:
+              - checkPart1
+              - checkPart2
+              - checkPart3
+              - checkPart4
+              - checkPart5
+              - checkPart6
+              - checkRestCompat
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: n1-standard-32
+          buildDirectory: /dev/shm/bk
+        env:
+          GRADLE_PARAMS: "-Druntime.java=$$JAVA_EA_VERSION"
+          GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
       - label: "{{matrix.BWC_VERSION}} / matrix-bwc"
         command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION  -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest
         timeout_in_minutes: 300

.buildkite/scripts/windows-run-gradle.sh

@@ -2,4 +2,4 @@
 
 set -euo pipefail
 
-.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $GRADLE_TASK
+.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true $GRADLE_PARAMS $GRADLE_TASK