From 061d338ec2589f7c923f1d36a1359e3ff971a9a4 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 26 Jun 2020 18:10:24 +0900 Subject: [PATCH] CI: run CRI tests on Fedora 32 SELinux is currently disabled Signed-off-by: Akihiro Suda --- .github/workflows/ci.yml | 3 +++ Vagrantfile | 45 +++++++++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a77083b0..25beecdf1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -442,3 +442,6 @@ jobs: - name: Integration run: vagrant ssh default -- sudo -i /integration.sh + + - name: CRI test + run: vagrant ssh default -- sudo -i /critest.sh diff --git a/Vagrantfile b/Vagrantfile index 472e40e44..87595771e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -33,16 +33,21 @@ Vagrant.configure("2") do |config| RUNC_FLAVOR="crun" # install dnf deps - dnf install -y gcc git libseccomp-devel lsof make + dnf install -y container-selinux gcc git iptables libseccomp-devel lsof make # install Go curl -fsSL "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" | tar Cxz /usr/local # setup env vars - cat >> /etc/profile.d/sh.local <> /etc/environment <> /etc/profile.d/sh.local < /etc/containerd/config.toml < /integration.sh < /critest.sh < /tmp/containerd-cri.log & +critest --runtime-endpoint=unix:///var/run/containerd/containerd.sock --parallel=2 +TEST_RC=\\$? +test \\$TEST_RC -ne 0 && cat /tmp/containerd-cri.log +pkill containerd +rm -rf /etc/containerd +exit \\$TEST_RC +EOF + chmod +x /critest.sh SHELL end