mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
parent
06e737367d
commit
f98b87cac1
@ -18,6 +18,7 @@ package testsuites
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
@ -324,3 +325,15 @@ func deleteStorageClass(cs clientset.Interface, className string) {
|
|||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func skipTestUntilBugfix(issueID string, driverName string, prefixes []string) {
|
||||||
|
var needSkip bool
|
||||||
|
for _, prefix := range prefixes {
|
||||||
|
if strings.HasPrefix(driverName, prefix) {
|
||||||
|
needSkip = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if needSkip {
|
||||||
|
framework.Skipf("Due to issue #%s, this test with %s doesn't pass, skipping until it fixes", issueID, driverName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -76,6 +76,7 @@ func createVolumeModeTestInput(pattern testpatterns.TestPattern, resource volume
|
|||||||
sc: resource.sc,
|
sc: resource.sc,
|
||||||
pvc: resource.pvc,
|
pvc: resource.pvc,
|
||||||
pv: resource.pv,
|
pv: resource.pv,
|
||||||
|
driverName: dInfo.Name,
|
||||||
testVolType: pattern.VolType,
|
testVolType: pattern.VolType,
|
||||||
nodeName: dInfo.Config.ClientNodeName,
|
nodeName: dInfo.Config.ClientNodeName,
|
||||||
volMode: pattern.VolMode,
|
volMode: pattern.VolMode,
|
||||||
@ -233,6 +234,7 @@ type volumeModeTestInput struct {
|
|||||||
sc *storagev1.StorageClass
|
sc *storagev1.StorageClass
|
||||||
pvc *v1.PersistentVolumeClaim
|
pvc *v1.PersistentVolumeClaim
|
||||||
pv *v1.PersistentVolume
|
pv *v1.PersistentVolume
|
||||||
|
driverName string
|
||||||
testVolType testpatterns.TestVolType
|
testVolType testpatterns.TestVolType
|
||||||
nodeName string
|
nodeName string
|
||||||
volMode v1.PersistentVolumeMode
|
volMode v1.PersistentVolumeMode
|
||||||
@ -339,6 +341,9 @@ func testVolumeModeSuccessForDynamicPV(input *volumeModeTestInput) {
|
|||||||
ns := f.Namespace
|
ns := f.Namespace
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
// TODO: This skip should be removed once #70760 is fixed
|
||||||
|
skipTestUntilBugfix("70760", input.driverName, []string{"csi-hostpath", "com.google.csi.gcepd"})
|
||||||
|
|
||||||
By("Creating sc")
|
By("Creating sc")
|
||||||
input.sc, err = cs.StorageV1().StorageClasses().Create(input.sc)
|
input.sc, err = cs.StorageV1().StorageClasses().Create(input.sc)
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
Loading…
Reference in New Issue
Block a user