Merge pull request #10822 from austinvazquez/cherry-pick-ee921689f739bd495b66105f62676e86c21718ba-to-1.7

estesp · web-flow · commit 13fdce89f719 · 2024-10-11T22:23:30.000-04:00
[release/1.7 backport] Switch from actuated.dev to GH Action runners for arm64
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,9 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019]
+        os: [ubuntu-20.04, arm64-8core-32gb, macos-13, windows-2019]
+        exclude:
+          - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
 
     steps:
       - uses: actions/checkout@v4
@@ -43,7 +45,6 @@ jobs:
   #
   project:
     name: Project Checks
-    if: github.repository == 'containerd/containerd'
     runs-on: ubuntu-20.04
     timeout-minutes: 5
 
@@ -56,6 +57,7 @@ jobs:
       - uses: ./src/github.com/containerd/containerd/.github/actions/install-go
 
       - uses: containerd/project-checks@v1.1.0
+        if: github.repository == 'containerd/containerd'
         with:
           working-directory: src/github.com/containerd/containerd
           repo-access-token: ${{ secrets.GITHUB_TOKEN }}
@@ -191,8 +193,10 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019, windows-2022]
+        os: [ubuntu-20.04, arm64-8core-32gb, macos-13, windows-2019, windows-2022]
         go-version: ["1.22.8", "1.23.2"]
+        exclude:
+          - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install-go
@@ -392,16 +396,17 @@ jobs:
           - io.containerd.runc.v2
         runc: [runc, crun]
         enable_cri_sandboxes: ["", "sandboxed"]
-        os: [ubuntu-20.04, actuated-arm64-4cpu-16gb]
+        os: [ubuntu-20.04, arm64-8core-32gb]
         exclude:
+          - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
           - runtime: io.containerd.runc.v1
             runc: crun
           - runtime: io.containerd.runtime.v1.linux
             runc: crun
           - runtime: io.containerd.runc.v1
-            os: actuated-arm64-4cpu-16gb
+            os: arm64-8core-32gb
           - runtime: io.containerd.runtime.v1.linux
-            os: actuated-arm64-4cpu-16gb
+            os: arm64-8core-32gb
 
     env:
       GOTEST: gotestsum --
@@ -422,10 +427,10 @@ jobs:
           script/setup/install-failpoint-binaries
 
       - name: Install criu
-        # NOTE: Required actuated enable CONFIG_CHECKPOINT_RESTORE
+        # NOTE: Required arm64 enable CONFIG_CHECKPOINT_RESTORE (need to confirm GitHub action runners config)
         #
         # REF: https://criu.org/Linux_kernel
-        if: matrix.os != 'actuated-arm64-4cpu-16gb'
+        if: matrix.os != 'arm64-8core-32gb'
         run: |
           sudo add-apt-repository -y ppa:criu/ppa
           sudo apt-get update
