e2e: restore volume lifecycle check for most tests, II

Besides "subPath should unmount if pod is gracefully deleted while kubelet is
down" we also need a special case for "subPath should unmount if pod is force
deleted while kubelet is down".

This fixes a test failure in https://testgrid.k8s.io/sig-storage-kubernetes#gce-serial
This commit is contained in:
Patrick Ohly 2021-10-14 09:14:26 +02:00
parent e99b945b17
commit 5378b4d220

View File

@ -40,6 +40,7 @@ import (
"encoding/json"
"errors"
"fmt"
"regexp"
"strconv"
"strings"
"sync"
@ -248,8 +249,7 @@ func (h *hostpathCSIDriver) PrepareTest(f *framework.Framework) (*storageframewo
// test that it breaks.
// TODO: enable this check once issue is resolved for csi-host-path driver
// (https://github.com/kubernetes/kubernetes/pull/104858).
if strings.Contains(ginkgo.CurrentGinkgoTestDescription().FullTestText,
"should unmount if pod is gracefully deleted while kubelet is down") {
if regexp.MustCompile("should unmount if pod is.*deleted while kubelet is down").MatchString(ginkgo.CurrentGinkgoTestDescription().FullTestText) {
o.DriverContainerArguments = append(o.DriverContainerArguments, "--check-volume-lifecycle=false")
}