From b2ee43206b24543d20a3a6590ae68eb343225257 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 15 Jul 2020 15:29:25 +0900 Subject: [PATCH] CI: add back shim v1 test We are going to deprecate shim v1 (#4365), but it is still early to disable the tests for them Signed-off-by: Akihiro Suda --- .github/workflows/ci.yml | 4 +++- container_test.go | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec090b01a..971a023c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -324,11 +324,13 @@ jobs: strategy: matrix: - runtime: [io.containerd.runc.v1, io.containerd.runc.v2] + runtime: [io.containerd.runtime.v1.linux, io.containerd.runc.v1, io.containerd.runc.v2] runc: [runc, crun] exclude: - runtime: io.containerd.runc.v1 runc: crun + - runtime: io.containerd.runtime.v1.linux + runc: crun steps: - name: Install Go diff --git a/container_test.go b/container_test.go index 0ed808948..530245a33 100644 --- a/container_test.go +++ b/container_test.go @@ -36,6 +36,7 @@ import ( "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/oci" "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/plugin" _ "github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/typeurl" @@ -661,6 +662,10 @@ func TestKillContainerDeletedByRunc(t *testing.T) { } defer client.Close() + if client.runtime == plugin.RuntimeLinuxV1 { + t.Skip("test relies on runtime v2") + } + var ( image Image ctx, cancel = testContext(t)