From 4b627dc2318e2568f0592e3a659c37c4024fd6f1 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 19 Jun 2024 17:18:47 -0600 Subject: [PATCH 1/3] Use new way of specifying test files to the vitess-tester Signed-off-by: Florent Poinsard --- .github/workflows/vitess_tester_vtgate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index dc84d511df6..77a9f2fd31f 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -143,9 +143,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 --sharded --xunit --test-dir $dir --vschema "$dir"vschema.json + vitess-tester --sharded --xunit --vschema "$dir"vschema.json "$dir"*.test else - vitess-tester --sharded --xunit --test-dir $dir + vitess-tester --sharded --xunit "$dir"*.test fi # Number the reports by changing their file names. mv report.xml report"$i".xml From a5e0e066fd7158f58507f210ef4d4bbe9df4b968 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Mon, 24 Jun 2024 10:14:11 -0600 Subject: [PATCH 2/3] Use newer vitess-tester commit Signed-off-by: Florent Poinsard --- .github/workflows/vitess_tester_vtgate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index 77a9f2fd31f..44ba6da5686 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@eb953122baba163ed8ccaa6642458ee984f5d7e4 + go install github.com/vitessio/vitess-tester@48bdc45d840fd64e3e9ff41ef3812cd2f2023853 - 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 c4da92748f08b38c3e7ce1cd6e5698e62b25af01 Mon Sep 17 00:00:00 2001 From: Andres Taylor Date: Tue, 25 Jun 2024 08:46:30 +0200 Subject: [PATCH 3/3] generated workflows Signed-off-by: Andres Taylor --- .github/workflows/vitess_tester_vtgate.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index 44ba6da5686..dc84d511df6 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@48bdc45d840fd64e3e9ff41ef3812cd2f2023853 + go install github.com/vitessio/vitess-tester@eb953122baba163ed8ccaa6642458ee984f5d7e4 - 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' @@ -143,9 +143,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 --sharded --xunit --vschema "$dir"vschema.json "$dir"*.test + vitess-tester --sharded --xunit --test-dir $dir --vschema "$dir"vschema.json else - vitess-tester --sharded --xunit "$dir"*.test + vitess-tester --sharded --xunit --test-dir $dir fi # Number the reports by changing their file names. mv report.xml report"$i".xml