Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jan 15, 2025
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d42a18
Rename docker clusters for more clarity and group all java test together
frouioui Jan 15, 2025
039f434
Fix path filtering
frouioui Jan 15, 2025
59bc153
Add ./test/config.json to the list of included paths
frouioui Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/docker_test_cluster_25.yml → .github/workflows/docker_test_cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/java_docker_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions test/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"java_test"
],
"Manual": false,
"Shard": "10",
"Shard": "java",
"RetryMax": 1,
"Tags": []
},
Expand All @@ -19,7 +19,7 @@
"test/client_test.sh"
],
"Manual": false,
"Shard": "25",
"Shard": "java",
"RetryMax": 1,
"Tags": []
},
Expand Down Expand Up @@ -483,7 +483,7 @@
],
"Command": [],
"Manual": false,
"Shard": "25",
"Shard": "docker_cluster",
"RetryMax": 1,
"Tags": [
"site_test"
Expand Down Expand Up @@ -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": []
},
Expand Down Expand Up @@ -1061,7 +1061,7 @@
"Args": ["vitess.io/vitess/go/test/endtoend/vtcombo"],
"Command": [],
"Manual": false,
"Shard": "25",
"Shard": "docker_cluster",
"RetryMax": 1,
"Tags": []
},
Expand Down
Loading