From e2a7d5e31415fbb47782b39f7c4ab43292ea0dab Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Fri, 31 May 2024 21:57:12 +0200 Subject: [PATCH] test templates Signed-off-by: Tim Vaillancourt --- test/templates/cluster_endtoend_test.tpl | 3 ++- test/templates/cluster_endtoend_test_docker.tpl | 3 ++- test/templates/cluster_endtoend_test_mysql57.tpl | 3 ++- test/templates/cluster_endtoend_test_self_hosted.tpl | 3 ++- test/templates/unit_test.tpl | 3 ++- test/templates/unit_test_self_hosted.tpl | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl index 526cb04da67..a0937e7423e 100644 --- a/test/templates/cluster_endtoend_test.tpl +++ b/test/templates/cluster_endtoend_test.tpl @@ -14,7 +14,8 @@ env: jobs: build: name: Run endtoend tests on {{.Name}} - runs-on: {{if .Cores16}}gh-hosted-runners-16cores-1{{else}}gh-hosted-runners-4cores-1{{end}} + runs-on: + group: vitess-ubuntu20 steps: - name: Skip CI diff --git a/test/templates/cluster_endtoend_test_docker.tpl b/test/templates/cluster_endtoend_test_docker.tpl index 650fc81a57a..cc8c9767916 100644 --- a/test/templates/cluster_endtoend_test_docker.tpl +++ b/test/templates/cluster_endtoend_test_docker.tpl @@ -6,7 +6,8 @@ permissions: read-all jobs: build: name: Run endtoend tests on {{.Name}} - runs-on: {{if .Cores16}}gh-hosted-runners-16cores-1{{else}}gh-hosted-runners-4cores-1{{end}} + runs-on: + group: vitess-ubuntu20 steps: - name: Skip CI diff --git a/test/templates/cluster_endtoend_test_mysql57.tpl b/test/templates/cluster_endtoend_test_mysql57.tpl index a2a23941f76..010867eef22 100644 --- a/test/templates/cluster_endtoend_test_mysql57.tpl +++ b/test/templates/cluster_endtoend_test_mysql57.tpl @@ -19,7 +19,8 @@ env: jobs: build: name: Run endtoend tests on {{.Name}} - runs-on: {{if .Cores16}}gh-hosted-runners-16cores-1{{else}}gh-hosted-runners-4cores-1{{end}} + runs-on: + group: vitess-ubuntu20 steps: - name: Skip CI diff --git a/test/templates/cluster_endtoend_test_self_hosted.tpl b/test/templates/cluster_endtoend_test_self_hosted.tpl index e28de83004e..22837471632 100644 --- a/test/templates/cluster_endtoend_test_self_hosted.tpl +++ b/test/templates/cluster_endtoend_test_self_hosted.tpl @@ -9,7 +9,8 @@ permissions: read-all jobs: build: name: Run endtoend tests on {{.Name}} - runs-on: self-hosted + runs-on: + group: vitess-ubuntu20 steps: - name: Skip CI diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl index 4179c362d3e..982288d999b 100644 --- a/test/templates/unit_test.tpl +++ b/test/templates/unit_test.tpl @@ -14,7 +14,8 @@ env: jobs: test: name: {{.Name}} - runs-on: gh-hosted-runners-4cores-1 + runs-on: + group: vitess-ubuntu20 steps: - name: Skip CI diff --git a/test/templates/unit_test_self_hosted.tpl b/test/templates/unit_test_self_hosted.tpl index c6d6790fbfb..b7a539a1a9f 100644 --- a/test/templates/unit_test_self_hosted.tpl +++ b/test/templates/unit_test_self_hosted.tpl @@ -8,7 +8,8 @@ permissions: read-all jobs: test: - runs-on: self-hosted + runs-on: + group: vitess-ubuntu20 steps: - name: Skip CI