github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Add ext4 and xfs tests to GCE PD basic mount tests

Browse Source
This commit is contained in:
Michelle Au 2017-07-24 18:45:14 -07:00
parent d368afd845
commit 20c7040c21
1 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
test/e2e/storage/volumes.go
View File

@ -421,52 +421,27 @@ var _ = SIGDescribe("Volumes", func() {
// GCE PD // GCE PD
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
Describe("PD", func() { Describe("PD", func() {
// Flaky issue: #43977 var config framework.VolumeTestConfig
It("should be mountable [Flaky]", func() {
BeforeEach(func() {
framework.SkipUnlessProviderIs("gce", "gke") framework.SkipUnlessProviderIs("gce", "gke")
config := framework.VolumeTestConfig{ config = framework.VolumeTestConfig{
Namespace: namespace.Name, Namespace: namespace.Name,
Prefix: "pd", Prefix: "pd",
} }
})
By("creating a test gce pd volume") It("should be mountable with ext3", func() {
volumeName, err := framework.CreatePDWithRetry() testGCEPD(f, config, cs, clean, "ext3")
Expect(err).NotTo(HaveOccurred()) })
defer func() { It("should be mountable with ext4", func() {
// - Get NodeName from the pod spec to which the volume is mounted. testGCEPD(f, config, cs, clean, "ext4")
// - Force detach and delete. })
pod, err := f.PodClient().Get(config.Prefix+"-client", metav1.GetOptions{}) It("should be mountable with xfs", func() {
Expect(err).NotTo(HaveOccurred(), "Failed getting pod %q.", config.Prefix+"-client") // xfs is not supported on gci
detachAndDeletePDs(volumeName, []types.NodeName{types.NodeName(pod.Spec.NodeName)}) // and not installed by default on debian
}() framework.SkipUnlessNodeOSDistroIs("ubuntu")
testGCEPD(f, config, cs, clean, "xfs")
defer func() {
if clean {
framework.Logf("Running volumeTestCleanup")
framework.VolumeTestCleanup(f, config)
}
}()
tests := []framework.VolumeTest{
{
Volume: v1.VolumeSource{
GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{
PDName: volumeName,
FSType: "ext3",
ReadOnly: false,
},
},
File: "index.html",
// Randomize index.html to make sure we don't see the
// content from previous test runs.
ExpectedContent: "Hello from GCE from namespace " + volumeName,
},
}
framework.InjectHtml(cs, config, tests[0].Volume, tests[0].ExpectedContent)
fsGroup := int64(1234)
framework.TestVolumeClient(cs, config, &fsGroup, tests)
}) })
}) })
@ -651,3 +626,44 @@ var _ = SIGDescribe("Volumes", func() {
}) })
}) })
}) })
func testGCEPD(f *framework.Framework, config framework.VolumeTestConfig, cs clientset.Interface, clean bool, fs string) {
By("creating a test gce pd volume")
volumeName, err := framework.CreatePDWithRetry()
Expect(err).NotTo(HaveOccurred())
defer func() {
// - Get NodeName from the pod spec to which the volume is mounted.
// - Force detach and delete.
pod, err := f.PodClient().Get(config.Prefix+"-client", metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred(), "Failed getting pod %q.", config.Prefix+"-client")
detachAndDeletePDs(volumeName, []types.NodeName{types.NodeName(pod.Spec.NodeName)})
}()
defer func() {
if clean {
framework.Logf("Running volumeTestCleanup")
framework.VolumeTestCleanup(f, config)
}
}()
tests := []framework.VolumeTest{
{
Volume: v1.VolumeSource{
GCEPersistentDisk: &v1.GCEPersistentDiskVolumeSource{
PDName: volumeName,
FSType: fs,
ReadOnly: false,
},
},
File: "index.html",
// Randomize index.html to make sure we don't see the
// content from previous test runs.
ExpectedContent: "Hello from GCE from namespace " + volumeName,
},
}
framework.InjectHtml(cs, config, tests[0].Volume, tests[0].ExpectedContent)
fsGroup := int64(1234)
framework.TestVolumeClient(cs, config, &fsGroup, tests)
}