diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml index ce3821396ea..e51dac64df1 100644 --- a/.github/workflows/vitess_tester_vtgate.yml +++ b/.github/workflows/vitess_tester_vtgate.yml @@ -112,7 +112,11 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester +<<<<<<< HEAD go install github.com/vitessio/vitess-tester@89dd933a9ea0e15f69ca58b9c8ea09a358762cca +======= + go install github.com/vitessio/vt/go/vt@e43009309f599378504905d4b804460f47822ac5 +>>>>>>> 0e22a3e397 (Change the name of the vitess-tester repository (#16917)) - 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' @@ -141,7 +145,7 @@ jobs: i=1 for dir in ./go/test/endtoend/vtgate/vitess_tester/*/; do # 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 there is a vschema file there, we use it, otherwise we let vt tester autogenerate it. if [ -f $dir/vschema.json ]; then vitess-tester --xunit --vschema "$dir"vschema.json $dir/*.test else diff --git a/go/test/endtoend/vtgate/queries/subquery/subquery_test.go b/go/test/endtoend/vtgate/queries/subquery/subquery_test.go index 50d6f02f3f4..29bd256ea51 100644 --- a/go/test/endtoend/vtgate/queries/subquery/subquery_test.go +++ b/go/test/endtoend/vtgate/queries/subquery/subquery_test.go @@ -188,7 +188,7 @@ func TestSubqueryInDerivedTable(t *testing.T) { } func TestSubqueries(t *testing.T) { - // This method tests many types of subqueries. The queries should move to a vitess-tester test file once we have a way to run them. + // This method tests many types of subqueries. The queries should move to a vt tester test file once we have a way to run them. // The commented out queries are failing because of wrong types being returned. // The tests are commented out until the issue is fixed. mcmp, closer := start(t) diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl index 9a6a71e15a7..fed7e8e1f1e 100644 --- a/test/templates/cluster_vitess_tester.tpl +++ b/test/templates/cluster_vitess_tester.tpl @@ -110,7 +110,11 @@ jobs: go install github.com/vitessio/go-junit-report@HEAD # install vitess tester +<<<<<<< HEAD go install github.com/vitessio/vitess-tester@89dd933a9ea0e15f69ca58b9c8ea09a358762cca +======= + go install github.com/vitessio/vt/go/vt@e43009309f599378504905d4b804460f47822ac5 +>>>>>>> 0e22a3e397 (Change the name of the vitess-tester repository (#16917)) - 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' @@ -139,7 +143,7 @@ jobs: i=1 for dir in {{.Path}}/*/; do # 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 there is a vschema file there, we use it, otherwise we let vt tester autogenerate it. if [ -f $dir/vschema.json ]; then vitess-tester --xunit --vschema "$dir"vschema.json $dir/*.test else