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

cgroup2 CI: add RUNC_FLAVOR=runc

Browse Source 
Previously we were only testing cgroup2 with crun

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2020-07-20 17:44:10 +09:00
parent e818fe27ce
commit b97c660e16
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,12 +434,16 @@ jobs:
runs-on: macos-10.15 runs-on: macos-10.15
timeout-minutes: 40 timeout-minutes: 40
needs: [project, linters, protos, man] needs: [project, linters, protos, man]
strategy:
matrix:
runc: [runc, crun]
steps: steps:
- name: Checkout containerd - name: Checkout containerd
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Start vagrant - name: Start vagrant
env:
RUNC_FLAVOR: ${{ matrix.runc }}
run: vagrant up run: vagrant up
- name: Integration - name: Integration

5
Vagrantfile vendored
View File

@ -26,11 +26,10 @@ Vagrant.configure("2") do |config|
v.memory = 2048 v.memory = 2048
v.cpus = 2 v.cpus = 2
end end
config.vm.provision "shell", inline: <<-SHELL config.vm.provision "shell", env: {"RUNC_FLAVOR"=>ENV["RUNC_FLAVOR"]}, inline: <<-SHELL
set -eux -o pipefail set -eux -o pipefail
# configuration # configuration
GO_VERSION="1.13.14" GO_VERSION="1.13.14"
RUNC_FLAVOR="crun"
# install dnf deps # install dnf deps
dnf install -y container-selinux gcc git iptables libseccomp-devel lsof make dnf install -y container-selinux gcc git iptables libseccomp-devel lsof make
@ -57,7 +56,7 @@ EOF
cd /root/go/src/github.com/containerd/containerd cd /root/go/src/github.com/containerd/containerd
# install runc (or crun) and other components # install runc (or crun) and other components
RUNC_FLAVOR=$RUNC_FLAVOR ./script/setup/install-runc ./script/setup/install-runc
./script/setup/install-cni ./script/setup/install-cni
./script/setup/install-critools ./script/setup/install-critools