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:
parent
c763f3afc2
commit
b2ee43206b
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -324,11 +324,13 @@ jobs:
|
|||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
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]
|
runc: [runc, crun]
|
||||||
exclude:
|
exclude:
|
||||||
- runtime: io.containerd.runc.v1
|
- runtime: io.containerd.runc.v1
|
||||||
runc: crun
|
runc: crun
|
||||||
|
- runtime: io.containerd.runtime.v1.linux
|
||||||
|
runc: crun
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install Go
|
- name: Install Go
|
||||||
|
@ -36,6 +36,7 @@ import (
|
|||||||
"github.com/containerd/containerd/namespaces"
|
"github.com/containerd/containerd/namespaces"
|
||||||
"github.com/containerd/containerd/oci"
|
"github.com/containerd/containerd/oci"
|
||||||
"github.com/containerd/containerd/platforms"
|
"github.com/containerd/containerd/platforms"
|
||||||
|
"github.com/containerd/containerd/plugin"
|
||||||
_ "github.com/containerd/containerd/runtime"
|
_ "github.com/containerd/containerd/runtime"
|
||||||
"github.com/containerd/containerd/runtime/v2/runc/options"
|
"github.com/containerd/containerd/runtime/v2/runc/options"
|
||||||
"github.com/containerd/typeurl"
|
"github.com/containerd/typeurl"
|
||||||
@ -661,6 +662,10 @@ func TestKillContainerDeletedByRunc(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer client.Close()
|
defer client.Close()
|
||||||
|
|
||||||
|
if client.runtime == plugin.RuntimeLinuxV1 {
|
||||||
|
t.Skip("test relies on runtime v2")
|
||||||
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
image Image
|
image Image
|
||||||
ctx, cancel = testContext(t)
|
ctx, cancel = testContext(t)
|
||||||
|
Loading…
Reference in New Issue
Block a user