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

Merge pull request #10883 from AkihiroSuda/crun

Browse Source 
CI: move crun from Ubuntu to Fedora
This commit is contained in:
Phil Estes 2024-10-24 13:23:23 +00:00 committed by GitHub
commit 3a89e2e1ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,7 +387,7 @@ jobs:
matrix: matrix:
runtime: runtime:
- io.containerd.runc.v2 - io.containerd.runc.v2
runc: [runc, crun] runc: [runc] # crun can be added here to debug crun issues
os: [ubuntu-22.04, ubuntu-24.04, arm64-8core-32gb] os: [ubuntu-22.04, ubuntu-24.04, arm64-8core-32gb]
exclude: exclude:
- os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }} - os: ${{ github.repository != 'containerd/containerd' && 'arm64-8core-32gb' }}
@ -533,18 +533,39 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
box: include:
- fedora/40-cloud-base - box: fedora/40-cloud-base
# We have to keep EL8 to test old glibc, cgroup, kernel, etc. cgroup_driver: cgroupfs
# The image was changed from rockylinux/8 to almalinux/8, runc: runc
# as the former one no longer works: - box: fedora/40-cloud-base
# https://github.com/containerd/containerd/pull/10297 cgroup_driver: systemd
- almalinux/8 runc: runc
- rockylinux/9@4.0.0 - box: fedora/40-cloud-base
cgroup_driver: [cgroupfs, systemd] cgroup_driver: cgroupfs
runc: crun
- box: fedora/40-cloud-base
cgroup_driver: systemd
runc: crun
# We have to keep EL8 to test old glibc, cgroup, kernel, etc.
# The image was changed from rockylinux/8 to almalinux/8,
# as the former one no longer works:
# https://github.com/containerd/containerd/pull/10297
- box: almalinux/8
cgroup_driver: cgroupfs
runc: runc
- box: almalinux/8
cgroup_driver: systemd
runc: runc
- box: rockylinux/9@4.0.0
cgroup_driver: cgroupfs
runc: runc
- box: rockylinux/9@4.0.0
cgroup_driver: systemd
runc: runc
env: env:
BOX: ${{ matrix.box }} BOX: ${{ matrix.box }}
CGROUP_DRIVER: ${{ matrix.cgroup_driver }} CGROUP_DRIVER: ${{ matrix.cgroup_driver }}
RUNC_FLAVOR: ${{ matrix.runc }}
steps: steps:
- name: Show the host info - name: Show the host info
run: | run: |
@ -574,13 +595,13 @@ jobs:
sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libvirt-dev ruby-bundler ruby-dev zlib1g-dev sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libvirt-dev ruby-bundler ruby-dev zlib1g-dev
sudo vagrant plugin install vagrant-libvirt sudo vagrant plugin install vagrant-libvirt
- name: Boot VM - name: Boot VM
run: sudo BOX=$BOX vagrant up --no-tty run: sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --no-tty
- name: test-integration - name: test-integration
run: sudo BOX=$BOX vagrant up --provision-with=selinux,install-runc,install-gotestsum,test-integration run: sudo BOX=$BOX RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --provision-with=selinux,install-runc,install-gotestsum,test-integration
- name: test-cri-integration - name: test-cri-integration
run: sudo BOX=$BOX CGROUP_DRIVER=$CGROUP_DRIVER vagrant up --provision-with=selinux,install-runc,install-gotestsum,test-cri-integration run: sudo BOX=$BOX CGROUP_DRIVER=$CGROUP_DRIVER RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --provision-with=selinux,install-runc,install-gotestsum,test-cri-integration
- name: test-cri - name: test-cri
run: sudo BOX=$BOX CGROUP_DRIVER=$CGROUP_DRIVER vagrant up --provision-with=selinux,install-runc,install-gotestsum,test-cri run: sudo BOX=$BOX CGROUP_DRIVER=$CGROUP_DRIVER RUNC_FLAVOR=$RUNC_FLAVOR vagrant up --provision-with=selinux,install-runc,install-gotestsum,test-cri
tests-cri-in-userns: tests-cri-in-userns:
name: "CRI-in-UserNS" name: "CRI-in-UserNS"