github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10821 from estesp/switch-arm-runners

Browse Source 
Switch from actuated.dev to GH Action runners for arm64
This commit is contained in:
Akihiro Suda 2024-10-12 05:18:59 +09:00 committed by GitHub
commit 08037e7624
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/ci.yml vendored
View File

@ -23,9 +23,9 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-24.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019] os: [ubuntu-24.04, arm64-8core-32gb, macos-13, windows-2019]
exclude: exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
steps: steps:
@ -190,10 +190,10 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-22.04, ubuntu-24.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019, windows-2022] os: [ubuntu-22.04, ubuntu-24.04, arm64-8core-32gb, macos-13, windows-2019, windows-2022]
go-version: ["1.22.8", "1.23.2"] go-version: ["1.22.8", "1.23.2"]
exclude: exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.github/actions/install-go - uses: ./.github/actions/install-go
@ -388,9 +388,9 @@ jobs:
runtime: runtime:
- io.containerd.runc.v2 - io.containerd.runc.v2
runc: [runc, crun] runc: [runc, crun]
os: [ubuntu-22.04, ubuntu-24.04, actuated-arm64-4cpu-16gb] os: [ubuntu-22.04, ubuntu-24.04, arm64-8core-32gb]
exclude: exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'actuated-arm64-4cpu-16gb' }} - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
cgroup_driver: [cgroupfs, systemd] cgroup_driver: [cgroupfs, systemd]
env: env:
@ -412,10 +412,10 @@ jobs:
script/setup/install-failpoint-binaries script/setup/install-failpoint-binaries
- name: Install criu - 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 # REF: https://criu.org/Linux_kernel
if: matrix.os != 'actuated-arm64-4cpu-16gb' if: matrix.os != 'arm64-8core-32gb'
run: | run: |
sudo add-apt-repository -y ppa:criu/ppa sudo add-apt-repository -y ppa:criu/ppa
sudo apt-get update sudo apt-get update
@ -491,12 +491,6 @@ jobs:
runc --version runc --version
CONTAINERD_RUNTIME=$TEST_RUNTIME make cri-integration CONTAINERD_RUNTIME=$TEST_RUNTIME make cri-integration
- name: Fix up for actuated
# https://github.com/containerd/containerd/pull/9920#issuecomment-2024823587
if: ${{ (matrix.os == 'actuated-arm64-4cpu-16gb') && (matrix.runc == 'crun') }}
run: |
echo "EXTRA_CRITEST_OPTIONS=--ginkgo.skip=runtime should support NamespaceMode_POD" >> $GITHUB_ENV
- name: cri-tools critest - name: cri-tools critest
env: env:
TEST_RUNTIME: ${{ matrix.runtime }} TEST_RUNTIME: ${{ matrix.runtime }}