github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

integration: assume TEST_RUNTIME to be io.containerd.runc.v2 by default

Browse Source 
containerd 1.4 uses io.containerd.runc.v2 as the default runtime for
both CRI and non-CRI. The test is updated to assume v2 shim by default.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2020-06-16 14:41:25 +09:00
parent 185ea541d2
commit 4c49ff88c5
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
container_linux_test.go
View File

@ -508,10 +508,10 @@ func getLogDirPath(runtimeVersion, id string) string {
func getRuntimeVersion() string { func getRuntimeVersion() string {
switch rt := os.Getenv("TEST_RUNTIME"); rt { switch rt := os.Getenv("TEST_RUNTIME"); rt {
case plugin.RuntimeRuncV1, plugin.RuntimeRuncV2: case plugin.RuntimeLinuxV1:
return "v2"
default:
return "v1" return "v1"
default:
return "v2"
} }
} }