Commit 288737d2 authored by xiangpengzhao's avatar xiangpengzhao

Add sig-storage prefix for common e2e tests

parent d0c4c564
...@@ -38,89 +38,88 @@ var ( ...@@ -38,89 +38,88 @@ var (
testImageNonRootUid = imageutils.GetE2EImage(imageutils.MounttestUser) testImageNonRootUid = imageutils.GetE2EImage(imageutils.MounttestUser)
) )
var _ = framework.KubeDescribe("EmptyDir volumes", func() { var _ = Describe("[sig-storage] EmptyDir volumes", func() {
f := framework.NewDefaultFramework("emptydir") f := framework.NewDefaultFramework("emptydir")
Context("when FSGroup is specified [Feature:FSGroup]", func() { Context("when FSGroup is specified [Feature:FSGroup]", func() {
It("new files should be created with FSGroup ownership when container is root [sig-storage]", func() { It("new files should be created with FSGroup ownership when container is root", func() {
doTestSetgidFSGroup(f, testImageRootUid, v1.StorageMediumMemory) doTestSetgidFSGroup(f, testImageRootUid, v1.StorageMediumMemory)
}) })
It("new files should be created with FSGroup ownership when container is non-root [sig-storage]", func() { It("new files should be created with FSGroup ownership when container is non-root", func() {
doTestSetgidFSGroup(f, testImageNonRootUid, v1.StorageMediumMemory) doTestSetgidFSGroup(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
It("nonexistent volume subPath should have the correct mode and owner using FSGroup [sig-storage]", func() { It("nonexistent volume subPath should have the correct mode and owner using FSGroup", func() {
doTestSubPathFSGroup(f, testImageNonRootUid, v1.StorageMediumMemory) doTestSubPathFSGroup(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
It("files with FSGroup ownership should support (root,0644,tmpfs) [sig-storage]", func() { It("files with FSGroup ownership should support (root,0644,tmpfs)", func() {
doTest0644FSGroup(f, testImageRootUid, v1.StorageMediumMemory) doTest0644FSGroup(f, testImageRootUid, v1.StorageMediumMemory)
}) })
It("volume on default medium should have the correct mode using FSGroup [sig-storage]", func() { It("volume on default medium should have the correct mode using FSGroup", func() {
doTestVolumeModeFSGroup(f, testImageRootUid, v1.StorageMediumDefault) doTestVolumeModeFSGroup(f, testImageRootUid, v1.StorageMediumDefault)
}) })
It("volume on tmpfs should have the correct mode using FSGroup [sig-storage]", func() { It("volume on tmpfs should have the correct mode using FSGroup", func() {
doTestVolumeModeFSGroup(f, testImageRootUid, v1.StorageMediumMemory) doTestVolumeModeFSGroup(f, testImageRootUid, v1.StorageMediumMemory)
}) })
}) })
framework.ConformanceIt("volume on tmpfs should have the correct mode [sig-storage]", func() { framework.ConformanceIt("volume on tmpfs should have the correct mode", func() {
doTestVolumeMode(f, testImageRootUid, v1.StorageMediumMemory) doTestVolumeMode(f, testImageRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (root,0644,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (root,0644,tmpfs)", func() {
doTest0644(f, testImageRootUid, v1.StorageMediumMemory) doTest0644(f, testImageRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (root,0666,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (root,0666,tmpfs)", func() {
doTest0666(f, testImageRootUid, v1.StorageMediumMemory) doTest0666(f, testImageRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (root,0777,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (root,0777,tmpfs)", func() {
doTest0777(f, testImageRootUid, v1.StorageMediumMemory) doTest0777(f, testImageRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (non-root,0644,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0644,tmpfs)", func() {
doTest0644(f, testImageNonRootUid, v1.StorageMediumMemory) doTest0644(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (non-root,0666,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0666,tmpfs)", func() {
doTest0666(f, testImageNonRootUid, v1.StorageMediumMemory) doTest0666(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (non-root,0777,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0777,tmpfs)", func() {
doTest0777(f, testImageNonRootUid, v1.StorageMediumMemory) doTest0777(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("volume on default medium should have the correct mode [sig-storage]", func() { framework.ConformanceIt("volume on default medium should have the correct mode", func() {
doTestVolumeMode(f, testImageRootUid, v1.StorageMediumDefault) doTestVolumeMode(f, testImageRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (root,0644,default) [sig-storage]", func() { framework.ConformanceIt("should support (root,0644,default)", func() {
doTest0644(f, testImageRootUid, v1.StorageMediumDefault) doTest0644(f, testImageRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (root,0666,default) [sig-storage]", func() { framework.ConformanceIt("should support (root,0666,default)", func() {
doTest0666(f, testImageRootUid, v1.StorageMediumDefault) doTest0666(f, testImageRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (root,0777,default) [sig-storage]", func() { framework.ConformanceIt("should support (root,0777,default)", func() {
doTest0777(f, testImageRootUid, v1.StorageMediumDefault) doTest0777(f, testImageRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (non-root,0644,default) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0644,default)", func() {
doTest0644(f, testImageNonRootUid, v1.StorageMediumDefault) doTest0644(f, testImageNonRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (non-root,0666,default) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0666,default)", func() {
doTest0666(f, testImageNonRootUid, v1.StorageMediumDefault) doTest0666(f, testImageNonRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (non-root,0777,default) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0777,default)", func() {
doTest0777(f, testImageNonRootUid, v1.StorageMediumDefault) doTest0777(f, testImageNonRootUid, v1.StorageMediumDefault)
}) })
}) })
......
...@@ -31,7 +31,7 @@ import ( ...@@ -31,7 +31,7 @@ import (
//TODO : Consolidate this code with the code for emptyDir. //TODO : Consolidate this code with the code for emptyDir.
//This will require some smart. //This will require some smart.
var _ = framework.KubeDescribe("HostPath", func() { var _ = Describe("[sig-storage] HostPath", func() {
f := framework.NewDefaultFramework("hostpath") f := framework.NewDefaultFramework("hostpath")
BeforeEach(func() { BeforeEach(func() {
...@@ -40,7 +40,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -40,7 +40,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
_ = os.Remove("/tmp/test-file") _ = os.Remove("/tmp/test-file")
}) })
framework.ConformanceIt("should give a volume the correct mode [sig-storage]", func() { framework.ConformanceIt("should give a volume the correct mode", func() {
source := &v1.HostPathVolumeSource{ source := &v1.HostPathVolumeSource{
Path: "/tmp", Path: "/tmp",
} }
...@@ -56,7 +56,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -56,7 +56,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
}) })
// This test requires mounting a folder into a container with write privileges. // This test requires mounting a folder into a container with write privileges.
It("should support r/w [sig-storage]", func() { It("should support r/w", func() {
filePath := path.Join(volumePath, "test-file") filePath := path.Join(volumePath, "test-file")
retryDuration := 180 retryDuration := 180
source := &v1.HostPathVolumeSource{ source := &v1.HostPathVolumeSource{
...@@ -80,7 +80,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -80,7 +80,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
}) })
}) })
It("should support subPath [sig-storage]", func() { It("should support subPath", func() {
subPath := "sub-path" subPath := "sub-path"
fileName := "test-file" fileName := "test-file"
retryDuration := 180 retryDuration := 180
...@@ -112,7 +112,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -112,7 +112,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
}) })
}) })
It("should support existing directory subPath [sig-storage]", func() { It("should support existing directory subPath", func() {
framework.SkipUnlessSSHKeyPresent() framework.SkipUnlessSSHKeyPresent()
subPath := "sub-path" subPath := "sub-path"
...@@ -158,7 +158,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -158,7 +158,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
}) })
// TODO consolidate common code of this test and above // TODO consolidate common code of this test and above
It("should support existing single file subPath [sig-storage]", func() { It("should support existing single file subPath", func() {
framework.SkipUnlessSSHKeyPresent() framework.SkipUnlessSSHKeyPresent()
subPath := "sub-path-test-file" subPath := "sub-path-test-file"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment