From 4d42a18abc87286eaaa33bf76629559d448cbedf Mon Sep 17 00:00:00 2001
From: Florent Poinsard <florent.poinsard@outlook.fr>
Date: Wed, 15 Jan 2025 11:40:28 -0600
Subject: [PATCH] Rename docker clusters for more clarity and group all java
 test together

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
---
 ...ker_test_cluster_25.yml => docker_test_cluster.yml} |  6 +++---
 .github/workflows/java_docker_test.yml                 |  2 +-
 test/config.json                                       | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename .github/workflows/{docker_test_cluster_25.yml => docker_test_cluster.yml} (94%)

diff --git a/.github/workflows/docker_test_cluster_25.yml b/.github/workflows/docker_test_cluster.yml
similarity index 94%
rename from .github/workflows/docker_test_cluster_25.yml
rename to .github/workflows/docker_test_cluster.yml
index a0159f941b0..b254aebd84a 100644
--- a/.github/workflows/docker_test_cluster_25.yml
+++ b/.github/workflows/docker_test_cluster.yml
@@ -1,10 +1,10 @@
-name: docker_test_cluster_25
+name: docker_test_cluster
 on: [push, pull_request]
 permissions: read-all
 jobs:
 
   build:
-    name: Docker Test Cluster 25
+    name: Docker Test Cluster
     runs-on: ubuntu-24.04
 
     steps:
@@ -66,4 +66,4 @@ jobs:
     - name: Run tests which require docker - 2
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
-        go run test.go -docker=true --follow -shard 25
+        go run test.go -docker=true --follow -shard docker_cluster
diff --git a/.github/workflows/java_docker_test.yml b/.github/workflows/java_docker_test.yml
index c49beba7b61..0296911eb10 100644
--- a/.github/workflows/java_docker_test.yml
+++ b/.github/workflows/java_docker_test.yml
@@ -68,4 +68,4 @@ jobs:
     - name: Run tests which require docker - 1
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'
       run: |
-        go run test.go -docker=true --follow -shard 10
+        go run test.go -docker=true --follow -shard java
diff --git a/test/config.json b/test/config.json
index dfc0910f10e..17cdb019e97 100644
--- a/test/config.json
+++ b/test/config.json
@@ -8,7 +8,7 @@
 				"java_test"
 			],
 			"Manual": false,
-			"Shard": "10",
+			"Shard": "java",
 			"RetryMax": 1,
 			"Tags": []
 		},
@@ -19,7 +19,7 @@
 				"test/client_test.sh"
 			],
 			"Manual": false,
-			"Shard": "25",
+			"Shard": "java",
 			"RetryMax": 1,
 			"Tags": []
 		},
@@ -483,7 +483,7 @@
 			],
 			"Command": [],
 			"Manual": false,
-			"Shard": "25",
+			"Shard": "docker_cluster",
 			"RetryMax": 1,
 			"Tags": [
 				"site_test"
@@ -989,7 +989,7 @@
 			"Args": ["vitess.io/vitess/go/test/endtoend/topotest/zk2", "--topo-flavor=zk2"],
 			"Command": [],
 			"Manual": false,
-			"Shard": "25",
+			"Shard": "docker_cluster",
 			"RetryMax": 1,
 			"Tags": []
 		},
@@ -1061,7 +1061,7 @@
 			"Args": ["vitess.io/vitess/go/test/endtoend/vtcombo"],
 			"Command": [],
 			"Manual": false,
-			"Shard": "25",
+			"Shard": "docker_cluster",
 			"RetryMax": 1,
 			"Tags": []
 		},