Merge pull request #180 from Shopify/fix-workflows

Run vtgate workflows on ubuntu and remove assign milestone
Shopify · Jul 29, 2024 · 59f9a19 · 59f9a19
2 parents 7461f20 + f3aff0d
commit 59f9a19
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 38 deletions.
diff --git a/.github/workflows/assign_milestone.yml b/.github/workflows/assign_milestone.yml
diff --git a/.github/workflows/vitess_tester_vtgate.yml b/.github/workflows/vitess_tester_vtgate.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   build:
     name: Run endtoend tests on Vitess Tester (vtgate)
-    runs-on: gh-hosted-runners-4cores-1
+    runs-on: ubuntu-latest
 
     steps:
     - name: Skip CI
@@ -110,7 +110,7 @@ jobs:
 
         # install JUnit report formatter
         go install github.com/vitessio/go-junit-report@HEAD
-        
+
         # install vitess tester
         go install github.com/vitessio/vitess-tester@eb953122baba163ed8ccaa6642458ee984f5d7e4
 
@@ -139,12 +139,12 @@ jobs:
         set -exo pipefail
 
         i=1
-        for dir in ./go/test/endtoend/vtgate/vitess_tester/*/; do 
+        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 [ -f $dir/vschema.json ]; then
             vitess-tester --sharded --xunit --test-dir $dir --vschema "$dir"vschema.json
-          else 
+          else
             vitess-tester --sharded --xunit --test-dir $dir
           fi
           # Number the reports by changing their file names.

diff --git a/test/templates/cluster_vitess_tester.tpl b/test/templates/cluster_vitess_tester.tpl
@@ -14,7 +14,7 @@ env:
 jobs:
   build:
     name: Run endtoend tests on {{.Name}}
-    runs-on: gh-hosted-runners-4cores-1
+    runs-on: ubuntu-latest
 
     steps:
     - name: Skip CI
@@ -108,7 +108,7 @@ jobs:
 
         # install JUnit report formatter
         go install github.com/vitessio/go-junit-report@HEAD
-        
+
         # install vitess tester
         go install github.com/vitessio/vitess-tester@eb953122baba163ed8ccaa6642458ee984f5d7e4
 
@@ -137,12 +137,12 @@ jobs:
         set -exo pipefail
 
         i=1
-        for dir in {{.Path}}/*/; do 
+        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 [ -f $dir/vschema.json ]; then
             vitess-tester --sharded --xunit --test-dir $dir --vschema "$dir"vschema.json
-          else 
+          else
             vitess-tester --sharded --xunit --test-dir $dir
           fi
           # Number the reports by changing their file names.