diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c76e72ad..94df30f8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -434,12 +434,16 @@ jobs: runs-on: macos-10.15 timeout-minutes: 40 needs: [project, linters, protos, man] - + strategy: + matrix: + runc: [runc, crun] steps: - name: Checkout containerd uses: actions/checkout@v2 - name: Start vagrant + env: + RUNC_FLAVOR: ${{ matrix.runc }} run: vagrant up - name: Integration diff --git a/Vagrantfile b/Vagrantfile index ad841cd8a..5275c8713 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -26,11 +26,10 @@ Vagrant.configure("2") do |config| v.memory = 2048 v.cpus = 2 end - config.vm.provision "shell", inline: <<-SHELL + config.vm.provision "shell", env: {"RUNC_FLAVOR"=>ENV["RUNC_FLAVOR"]}, inline: <<-SHELL set -eux -o pipefail # configuration GO_VERSION="1.13.14" - RUNC_FLAVOR="crun" # install dnf deps 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 # 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-critools