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 <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2020-07-15 15:29:25 +09:00
parent c763f3afc2
commit b2ee43206b
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
2 changed files with 8 additions and 1 deletions

View File

@ -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

View File

@ -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)