From 8c58f78c2088fe473aa03f184a8a2907e4a44840 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Tue, 12 Mar 2024 16:54:57 -0700 Subject: [PATCH 1/2] Update github actions ci to run on forks Excludes actuated when on fork. Runs some project tests on fork. Signed-off-by: Derek McGowan (cherry picked from commit 357c59b7996171aa28731bba745297a8be4abb74) Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edef8c7c16a2..7309e477bd48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,8 @@ jobs: strategy: matrix: os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019] + exclude: + - os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} steps: - name: Install dependencies @@ -49,7 +51,6 @@ jobs: # project: name: Project Checks - if: github.repository == 'containerd/containerd' runs-on: ubuntu-20.04 timeout-minutes: 5 @@ -62,6 +63,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 }} @@ -219,6 +221,8 @@ jobs: matrix: os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019, windows-2022] go-version: ["1.22.8", "1.23.2"] + exclude: + - os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} steps: - name: Install dependencies if: matrix.os == 'ubuntu-20.04' || matrix.os == 'actuated-arm64-4cpu-16gb' @@ -350,7 +354,9 @@ jobs: matrix: runtime: [io.containerd.runtime.v1.linux, io.containerd.runc.v1, io.containerd.runc.v2] runc: [runc, crun] + os: [ubuntu-20.04, actuated-arm64-4cpu-16gb] exclude: + - os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} - runtime: io.containerd.runc.v1 runc: crun - runtime: io.containerd.runtime.v1.linux @@ -361,7 +367,6 @@ jobs: # shim.v1 doesn't support cgroupv2 - runtime: io.containerd.runtime.v1.linux os: actuated-arm64-4cpu-16gb - os: [ubuntu-20.04, actuated-arm64-4cpu-16gb] env: GOTEST: gotestsum -- From ba411483a4b523824f9273781a1ad5a84e72ffcc Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Fri, 11 Oct 2024 13:30:43 -0400 Subject: [PATCH 2/2] Switch from actuated.dev to GH Action runners for arm64 Signed-off-by: Phil Estes (cherry picked from commit ee921689f739bd495b66105f62676e86c21718ba) Signed-off-by: Austin Vazquez --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7309e477bd48..b1243dfd6456 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,13 +26,13 @@ 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' && 'actuated-arm64-4cpu-16gb' }} + - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }} steps: - name: Install dependencies - if: matrix.os == 'ubuntu-20.04' || matrix.os == 'actuated-arm64-4cpu-16gb' + if: matrix.os == 'ubuntu-20.04' || matrix.os == 'arm64-8core-32gb' run: | sudo apt-get update sudo apt-get install -y libbtrfs-dev @@ -219,13 +219,13 @@ 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' && 'actuated-arm64-4cpu-16gb' }} + - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }} steps: - name: Install dependencies - if: matrix.os == 'ubuntu-20.04' || matrix.os == 'actuated-arm64-4cpu-16gb' + if: matrix.os == 'ubuntu-20.04' || matrix.os == 'arm64-8core-32gb' run: | sudo apt-get update sudo apt-get install -y libbtrfs-dev @@ -354,19 +354,19 @@ jobs: matrix: runtime: [io.containerd.runtime.v1.linux, io.containerd.runc.v1, io.containerd.runc.v2] runc: [runc, crun] - os: [ubuntu-20.04, actuated-arm64-4cpu-16gb] + os: [ubuntu-20.04, arm64-8core-32gb] exclude: - - os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} + - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }} - runtime: io.containerd.runc.v1 runc: crun - runtime: io.containerd.runtime.v1.linux runc: crun # runc.v1 doesn't support cgroupv2 - runtime: io.containerd.runc.v1 - os: actuated-arm64-4cpu-16gb + os: arm64-8core-32gb # shim.v1 doesn't support cgroupv2 - runtime: io.containerd.runtime.v1.linux - os: actuated-arm64-4cpu-16gb + os: arm64-8core-32gb env: GOTEST: gotestsum -- @@ -386,10 +386,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 ppa:criu/ppa sudo apt-get update