From 4c49ff88c5b901fc3b45077c88af932fb7ad4e76 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 16 Jun 2020 14:41:25 +0900 Subject: [PATCH] integration: assume TEST_RUNTIME to be io.containerd.runc.v2 by default 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 --- container_linux_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container_linux_test.go b/container_linux_test.go index f5e98e28f..ece24bf66 100644 --- a/container_linux_test.go +++ b/container_linux_test.go @@ -508,10 +508,10 @@ func getLogDirPath(runtimeVersion, id string) string { func getRuntimeVersion() string { switch rt := os.Getenv("TEST_RUNTIME"); rt { - case plugin.RuntimeRuncV1, plugin.RuntimeRuncV2: - return "v2" - default: + case plugin.RuntimeLinuxV1: return "v1" + default: + return "v2" } }