Rename docker clusters for more clarity and group all java test together

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
planetscale · Jan 15, 2025 · 4d42a18 · 4d42a18
1 parent 8e905aa
commit 4d42a18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/docker_test_cluster_25.yml → .github/workflows/docker_test_cluster.yml b/.github/workflows/docker_test_cluster_25.yml → .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
@@ -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
@@ -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": []
 		},