github wokflow: use large runner for race tests

Remove the resource limits from `GOGC`, and set the GitHub workflow to run on a large runners for race tests (ubuntu 8 cores for amd64, and actuabed 8 cores for arm64). Signed-off-by: Ivan Valdes <[email protected]>
etcd-io · Nov 16, 2023 · 88aefc6 · 88aefc6
1 parent 33db274
commit 88aefc6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/.github/workflows/tests-template.yml b/.github/workflows/tests-template.yml
@@ -6,20 +6,20 @@ on:
       runs-on:
         required: false
         type: string
-        default: "['ubuntu-latest']"
+        default: ubuntu-latest
+      targets:
+        required: false
+        type: string
+        default: "['linux-unit-test-1-cpu','linux-unit-test-2-cpu','linux-unit-test-4-cpu']"
 permissions: read-all
 
 jobs:
   test-linux:
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - linux-unit-test-1-cpu
-          - linux-unit-test-2-cpu
-          - linux-unit-test-4-cpu
-          - linux-unit-test-4-cpu-race
-    runs-on: ${{ fromJson(inputs.runs-on) }}
+        target: ${{ fromJSON(inputs.targets) }}
+    runs-on: ${{ inputs.runs-on }}
     steps:
       - uses: actions/checkout@v4
       - id: goversion
@@ -42,13 +42,7 @@ jobs:
               CPU=4 make test
               ;;
             linux-unit-test-4-cpu-race)
-              # XXX: By default, the Github Action runner will terminate the process
-              # if it has high resource usage. Try to use GOGC to limit memory and
-              # cpu usage here to prevent unexpected terminating. It can be replaced
-              # with GOMEMLIMIT=2048MiB if the go-version is updated to >=1.19.x.
-              #
-              # REF: https://github.com/actions/runner-images/issues/6680#issuecomment-1335778010
-              GOGC=30 CPU=4 ENABLE_RACE=true make test
+              CPU=4 ENABLE_RACE=true make test
               ;;
             *)
               echo "Failed to find target"

diff --git a/.github/workflows/tests_amd64.yaml b/.github/workflows/tests_amd64.yaml
@@ -4,9 +4,16 @@ on: [push, pull_request]
 jobs:
   test-linux-amd64:
     uses: ./.github/workflows/tests-template.yml
+  test-linux-amd64-race:
+    uses: ./.github/workflows/tests-template.yml
+    with:
+      runs-on: ubuntu-latest-8-cores
+      targets: "['linux-unit-test-4-cpu-race']"
 
   coverage:
-    needs: ["test-linux-amd64"]
+    needs:
+      - test-linux-amd64
+      - test-linux-amd64-race
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/tests_arm64.yaml b/.github/workflows/tests_arm64.yaml
@@ -5,4 +5,9 @@ jobs:
   test-linux-arm64:
     uses: ./.github/workflows/tests-template.yml
     with:
-      runs-on: "['actuated-arm64-4cpu-16gb']"
+      runs-on: actuated-arm64-4cpu-16gb
+  test-linux-arm64-race:
+    uses: ./.github/workflows/tests-template.yml
+    with:
+      runs-on: actuated-arm64-8cpu-16gb
+      targets: "['linux-unit-test-4-cpu-race']"