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

Merge pull request #4324 from AkihiroSuda/fix-get-runtimeversion

Browse Source 
integration: assume TEST_RUNTIME to be io.containerd.runc.v2 by default
This commit is contained in:
Phil Estes 2020-06-16 08:44:22 -04:00 committed by GitHub
commit 49b0743c1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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"
} }
} }