diff --git a/build/integration-in-docker.sh b/build/integration-in-docker.sh index ad36ceff45..aa58f35e9b 100755 --- a/build/integration-in-docker.sh +++ b/build/integration-in-docker.sh @@ -58,7 +58,7 @@ function run_tests() { --privileged \ --cap-add="sys_admin" \ --entrypoint="" \ - gcr.io/k8s-staging-test-infra/bootstrap:v20250702-52f5173c3a \ + gcr.io/k8s-staging-test-infra/bootstrap \ bash -c "export DEBIAN_FRONTEND=noninteractive && \ apt update && \ apt install -y $PACKAGES && \ diff --git a/integration/framework/framework.go b/integration/framework/framework.go index a063bd60d4..d54dabacf9 100644 --- a/integration/framework/framework.go +++ b/integration/framework/framework.go @@ -103,6 +103,7 @@ const ( Aufs string = "aufs" Overlay string = "overlay" Overlay2 string = "overlay2" + OverlayFS string = "overlayfs" // containerd overlayfs snapshotter DeviceMapper string = "devicemapper" Unknown string = "" ) @@ -312,26 +313,17 @@ func (a dockerActions) Version() []string { } func (a dockerActions) StorageDriver() string { - dockerCommand := []string{"docker", "info"} - output, _ := a.fm.Shell().Run("sudo", dockerCommand...) - if len(output) < 1 { + output, _ := a.fm.Shell().Run("sudo", "docker", "info", "--format", "{{.Driver}}") + driver := strings.TrimSpace(output) + if driver == "" { a.fm.T().Fatalf("failed to find docker storage driver - %v", output) } - for _, line := range strings.Split(output, "\n") { - line = strings.TrimSpace(line) - if strings.HasPrefix(line, "Storage Driver: ") { - idx := strings.LastIndex(line, ": ") + 2 - driver := line[idx:] - switch driver { - case Aufs, Overlay, Overlay2, DeviceMapper: - return driver - default: - return Unknown - } - } + switch driver { + case Aufs, Overlay, Overlay2, OverlayFS, DeviceMapper: + return driver + default: + return Unknown } - a.fm.T().Fatalf("failed to find docker storage driver from info - %v", output) - return Unknown } func (a dockerActions) RunStress(args DockerRunArgs, cmd ...string) string { diff --git a/integration/tests/api/docker_test.go b/integration/tests/api/docker_test.go index e9a606fc26..17d3f7b4f3 100644 --- a/integration/tests/api/docker_test.go +++ b/integration/tests/api/docker_test.go @@ -349,7 +349,7 @@ func TestDockerFilesystemStats(t *testing.T) { } needsBaseUsageCheck := false switch storageDriver { - case framework.Aufs, framework.Overlay, framework.Overlay2, framework.DeviceMapper: + case framework.Aufs, framework.Overlay, framework.Overlay2, framework.OverlayFS: needsBaseUsageCheck = true } pass := false