From 452fb8b2ee30b1b174cc2fe99b7354b5fbff7b3b Mon Sep 17 00:00:00 2001 From: Andres Taylor Date: Thu, 3 Oct 2024 09:51:17 +0200 Subject: [PATCH 1/6] upgrade vitess tester to latest version Signed-off-by: Andres Taylor --- .github/workflows/vitess_tester_vtgate.yml | 6 +++--- test/templates/cluster_vitess_tester.tpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index 887d6a4d095..76d92545f88 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -112,7 +112,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester@89dd933a9ea0e15f69ca58b9c8ea09a358762cca + go install github.com/vitessio/vitess-tester@a2bcb1180cb663e388491c66a5f96738e5a94453 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' @@ -144,9 +144,9 @@ jobs: # We go over all the directories in the given path. # If there is a vschema file there, we use it, otherwise we let vitess-tester autogenerate it. if [ -f $dir/vschema.json ]; then - vitess-tester --xunit --vschema "$dir"vschema.json $dir/*.test + vt tester --xunit --vschema "$dir"vschema.json $dir/*.test else - vitess-tester --sharded --xunit $dir/*.test + vt tester --sharded --xunit $dir/*.test fi # Number the reports by changing their file names. mv report.xml report"$i".xml diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl index ae9191991fd..1b1712f818f 100644 --- a/test/templates/cluster_vitess_tester.tpl +++ b/test/templates/cluster_vitess_tester.tpl @@ -110,7 +110,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester@89dd933a9ea0e15f69ca58b9c8ea09a358762cca + go install github.com/vitessio/vitess-tester@a2bcb1180cb663e388491c66a5f96738e5a94453 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' @@ -142,9 +142,9 @@ jobs: # We go over all the directories in the given path. # If there is a vschema file there, we use it, otherwise we let vitess-tester autogenerate it. if [ -f $dir/vschema.json ]; then - vitess-tester --xunit --vschema "$dir"vschema.json $dir/*.test + vt tester --xunit --vschema "$dir"vschema.json $dir/*.test else - vitess-tester --sharded --xunit $dir/*.test + vt tester --sharded --xunit $dir/*.test fi # Number the reports by changing their file names. mv report.xml report"$i".xml From 87741a97ecaa4d792335e6858aa663cae629a253 Mon Sep 17 00:00:00 2001 From: Andres Taylor Date: Thu, 3 Oct 2024 10:25:36 +0200 Subject: [PATCH 2/6] install correctly Signed-off-by: Andres Taylor --- .github/workflows/vitess_tester_vtgate.yml | 2 +- test/templates/cluster_vitess_tester.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index 76d92545f88..627cffc91f6 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -112,7 +112,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester@a2bcb1180cb663e388491c66a5f96738e5a94453 + go install github.com/vitessio/vitess-tester/go/vt@a2bcb1180cb663e388491c66a5f96738e5a94453 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl index 1b1712f818f..323c0d35973 100644 --- a/test/templates/cluster_vitess_tester.tpl +++ b/test/templates/cluster_vitess_tester.tpl @@ -110,7 +110,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester@a2bcb1180cb663e388491c66a5f96738e5a94453 + go install github.com/vitessio/vitess-tester/go/vt@a2bcb1180cb663e388491c66a5f96738e5a94453 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' From 896fe2a8752e4dc0706aba781d2993333423ee9c Mon Sep 17 00:00:00 2001 From: Andres Taylor Date: Thu, 3 Oct 2024 10:28:26 +0200 Subject: [PATCH 3/6] correct version Signed-off-by: Andres Taylor --- .github/workflows/vitess_tester_vtgate.yml | 2 +- test/templates/cluster_vitess_tester.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index 627cffc91f6..7f3ef19b84f 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -112,7 +112,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester/go/vt@a2bcb1180cb663e388491c66a5f96738e5a94453 + go install github.com/vitessio/vitess-tester/go/vt@676663517bff9649ede4304b059c69ac28201944 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl index 323c0d35973..5794de43d58 100644 --- a/test/templates/cluster_vitess_tester.tpl +++ b/test/templates/cluster_vitess_tester.tpl @@ -110,7 +110,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester/go/vt@a2bcb1180cb663e388491c66a5f96738e5a94453 + go install github.com/vitessio/vitess-tester/go/vt@676663517bff9649ede4304b059c69ac28201944 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' From 2036f1f795a30b5dcaf6a0238353e1f5f23669de Mon Sep 17 00:00:00 2001 From: Andres Taylor Date: Thu, 3 Oct 2024 15:03:49 +0200 Subject: [PATCH 4/6] update to fixed version Signed-off-by: Andres Taylor --- .github/workflows/vitess_tester_vtgate.yml | 2 +- test/templates/cluster_vitess_tester.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index 7f3ef19b84f..649a8adcb5c 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -112,7 +112,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester/go/vt@676663517bff9649ede4304b059c69ac28201944 + go install github.com/vitessio/vitess-tester/go/vt@37c2b3f1f67ef4f37f5fa191e5de92f48f071f2d - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl index 5794de43d58..8eb40333637 100644 --- a/test/templates/cluster_vitess_tester.tpl +++ b/test/templates/cluster_vitess_tester.tpl @@ -110,7 +110,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester/go/vt@676663517bff9649ede4304b059c69ac28201944 + go install github.com/vitessio/vitess-tester/go/vt@37c2b3f1f67ef4f37f5fa191e5de92f48f071f2d - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' From 12860e586a3d898a8690bae4464347d6211cccdf Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Thu, 3 Oct 2024 08:22:58 -0600 Subject: [PATCH 5/6] Use latest version Signed-off-by: Florent Poinsard --- .github/workflows/vitess_tester_vtgate.yml | 2 +- test/templates/cluster_vitess_tester.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index 649a8adcb5c..4ba1b82d10d 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -112,7 +112,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester/go/vt@37c2b3f1f67ef4f37f5fa191e5de92f48f071f2d + go install github.com/vitessio/vitess-tester/go/vt@374fd9f495c1afd3b6bea9d4ec7728119714055cd - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl index 8eb40333637..18d1bbd380e 100644 --- a/test/templates/cluster_vitess_tester.tpl +++ b/test/templates/cluster_vitess_tester.tpl @@ -110,7 +110,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester/go/vt@37c2b3f1f67ef4f37f5fa191e5de92f48f071f2d + go install github.com/vitessio/vitess-tester/go/vt@374fd9f495c1afd3b6bea9d4ec7728119714055cd - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' From cec4b8926f21311c94ee70162b4a5323de3d9fae Mon Sep 17 00:00:00 2001 From: Andres Taylor Date: Thu, 3 Oct 2024 16:46:48 +0200 Subject: [PATCH 6/6] oops Signed-off-by: Andres Taylor --- .github/workflows/vitess_tester_vtgate.yml | 2 +- test/templates/cluster_vitess_tester.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index 4ba1b82d10d..64b429a3724 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -112,7 +112,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester/go/vt@374fd9f495c1afd3b6bea9d4ec7728119714055cd + go install github.com/vitessio/vitess-tester/go/vt@374fd9f495c1afd3b6bea9d4ec7728119714055 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl index 18d1bbd380e..db492dad21b 100644 --- a/test/templates/cluster_vitess_tester.tpl +++ b/test/templates/cluster_vitess_tester.tpl @@ -110,7 +110,7 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester - go install github.com/vitessio/vitess-tester/go/vt@374fd9f495c1afd3b6bea9d4ec7728119714055cd + go install github.com/vitessio/vitess-tester/go/vt@374fd9f495c1afd3b6bea9d4ec7728119714055 - name: Setup launchable dependencies if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main'