github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80213 from bclau/tests/skips-windows-unrelated-tests

Browse Source 
tests: Skips Windows-unrelated tests on Windows
This commit is contained in:
Kubernetes Prow Robot
2019-08-23 20:56:25 -07:00
committed by GitHub
parent 9a5b87a58b 8812720148
commit 8dc4b1b585
13 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/common/configmap_volume.go
View File

@@ -54,7 +54,9 @@ var _ = ginkgo.Describe("[sig-storage] ConfigMap", func() {
doConfigMapE2EWithoutMappings(f, 0, 0, &defaultMode)
})
ginkgo.It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [NodeFeature:FSGroup]", func() {
ginkgo.It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options, and it does not support setting file permissions.
framework.SkipIfNodeOSDistroIs("windows")
defaultMode := int32(0440) /* setting fsGroup sets mode to at least 440 */
doConfigMapE2EWithoutMappings(f, 1000, 1001, &defaultMode)
})
@@ -69,7 +71,9 @@ var _ = ginkgo.Describe("[sig-storage] ConfigMap", func() {
doConfigMapE2EWithoutMappings(f, 1000, 0, nil)
})
ginkgo.It("should be consumable from pods in volume as non-root with FSGroup [NodeFeature:FSGroup]", func() {
ginkgo.It("should be consumable from pods in volume as non-root with FSGroup [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options.
framework.SkipIfNodeOSDistroIs("windows")
doConfigMapE2EWithoutMappings(f, 1000, 1001, nil)
})
@@ -103,7 +107,9 @@ var _ = ginkgo.Describe("[sig-storage] ConfigMap", func() {
doConfigMapE2EWithMappings(f, 1000, 0, nil)
})
ginkgo.It("should be consumable from pods in volume with mappings as non-root with FSGroup [NodeFeature:FSGroup]", func() {
ginkgo.It("should be consumable from pods in volume with mappings as non-root with FSGroup [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options.
framework.SkipIfNodeOSDistroIs("windows")
doConfigMapE2EWithMappings(f, 1000, 1001, nil)
})

8
test/e2e/common/downwardapi_volume.go
View File

@@ -87,7 +87,9 @@ var _ = ginkgo.Describe("[sig-storage] Downward API volume", func() {
})
})
ginkgo.It("should provide podname as non-root with fsgroup [NodeFeature:FSGroup]", func() {
ginkgo.It("should provide podname as non-root with fsgroup [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options.
framework.SkipIfNodeOSDistroIs("windows")
podName := "metadata-volume-" + string(uuid.NewUUID())
uid := int64(1001)
gid := int64(1234)
@@ -101,7 +103,9 @@ var _ = ginkgo.Describe("[sig-storage] Downward API volume", func() {
})
})
ginkgo.It("should provide podname as non-root with fsgroup and defaultMode [NodeFeature:FSGroup]", func() {
ginkgo.It("should provide podname as non-root with fsgroup and defaultMode [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options, and it does not support setting file permissions.
framework.SkipIfNodeOSDistroIs("windows")
podName := "metadata-volume-" + string(uuid.NewUUID())
uid := int64(1001)
gid := int64(1234)

8
test/e2e/common/empty_dir.go
View File

@@ -41,7 +41,13 @@ var (
var _ = ginkgo.Describe("[sig-storage] EmptyDir volumes", func() {
f := framework.NewDefaultFramework("emptydir")
ginkgo.Context("when FSGroup is specified [NodeFeature:FSGroup]", func() {
ginkgo.Context("when FSGroup is specified [LinuxOnly] [NodeFeature:FSGroup]", func() {
ginkgo.BeforeEach(func() {
// Windows does not support the FSGroup SecurityContext option.
framework.SkipIfNodeOSDistroIs("windows")
})
ginkgo.It("new files should be created with FSGroup ownership when container is root", func() {
doTestSetgidFSGroup(f, testImageRootUid, v1.StorageMediumMemory)
})

12
test/e2e/common/projected_configmap.go
View File

@@ -55,7 +55,9 @@ var _ = ginkgo.Describe("[sig-storage] Projected configMap", func() {
doProjectedConfigMapE2EWithoutMappings(f, 0, 0, &defaultMode)
})
ginkgo.It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [NodeFeature:FSGroup]", func() {
ginkgo.It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options, and it does not support setting file permissions.
framework.SkipIfNodeOSDistroIs("windows")
defaultMode := int32(0440) /* setting fsGroup sets mode to at least 440 */
doProjectedConfigMapE2EWithoutMappings(f, 1000, 1001, &defaultMode)
})
@@ -70,7 +72,9 @@ var _ = ginkgo.Describe("[sig-storage] Projected configMap", func() {
doProjectedConfigMapE2EWithoutMappings(f, 1000, 0, nil)
})
ginkgo.It("should be consumable from pods in volume as non-root with FSGroup [NodeFeature:FSGroup]", func() {
ginkgo.It("should be consumable from pods in volume as non-root with FSGroup [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options.
framework.SkipIfNodeOSDistroIs("windows")
doProjectedConfigMapE2EWithoutMappings(f, 1000, 1001, nil)
})
@@ -104,7 +108,9 @@ var _ = ginkgo.Describe("[sig-storage] Projected configMap", func() {
doProjectedConfigMapE2EWithMappings(f, 1000, 0, nil)
})
ginkgo.It("should be consumable from pods in volume with mappings as non-root with FSGroup [NodeFeature:FSGroup]", func() {
ginkgo.It("should be consumable from pods in volume with mappings as non-root with FSGroup [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options.
framework.SkipIfNodeOSDistroIs("windows")
doProjectedConfigMapE2EWithMappings(f, 1000, 1001, nil)
})

8
test/e2e/common/projected_downwardapi.go
View File

@@ -87,7 +87,9 @@ var _ = ginkgo.Describe("[sig-storage] Projected downwardAPI", func() {
})
})
ginkgo.It("should provide podname as non-root with fsgroup [NodeFeature:FSGroup]", func() {
ginkgo.It("should provide podname as non-root with fsgroup [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options.
framework.SkipIfNodeOSDistroIs("windows")
podName := "metadata-volume-" + string(uuid.NewUUID())
uid := int64(1001)
gid := int64(1234)
@@ -101,7 +103,9 @@ var _ = ginkgo.Describe("[sig-storage] Projected downwardAPI", func() {
})
})
ginkgo.It("should provide podname as non-root with fsgroup and defaultMode [NodeFeature:FSGroup]", func() {
ginkgo.It("should provide podname as non-root with fsgroup and defaultMode [LinuxOnly] [NodeFeature:FSGroup]", func() {
// Windows does not support RunAsUser / FSGroup SecurityContext options, and it does not support setting file permissions.
framework.SkipIfNodeOSDistroIs("windows")
podName := "metadata-volume-" + string(uuid.NewUUID())
uid := int64(1001)
gid := int64(1234)

8
test/e2e/common/security_context.go
View File

@@ -120,7 +120,9 @@ var _ = framework.KubeDescribe("Security Context", func() {
}
}
ginkgo.It("should run with an explicit non-root user ID", func() {
ginkgo.It("should run with an explicit non-root user ID [LinuxOnly]", func() {
// creates a pod with RunAsUser, which is not supported on Windows.
framework.SkipIfNodeOSDistroIs("windows")
name := "explicit-nonroot-uid"
pod := makeNonRootPod(name, rootImage, pointer.Int64Ptr(1234))
pod = podClient.Create(pod)
@@ -128,7 +130,9 @@ var _ = framework.KubeDescribe("Security Context", func() {
podClient.WaitForSuccess(name, framework.PodStartTimeout)
framework.ExpectNoError(podClient.MatchContainerOutput(name, name, "1234"))
})
ginkgo.It("should not run with an explicit root user ID", func() {
ginkgo.It("should not run with an explicit root user ID [LinuxOnly]", func() {
// creates a pod with RunAsUser, which is not supported on Windows.
framework.SkipIfNodeOSDistroIs("windows")
name := "explicit-root-uid"
pod := makeNonRootPod(name, nonRootImage, pointer.Int64Ptr(0))
pod = podClient.Create(pod)

8
test/e2e/common/sysctl.go
View File

@@ -29,7 +29,13 @@ import (
"github.com/onsi/gomega"
)
var _ = framework.KubeDescribe("Sysctls [NodeFeature:Sysctls]", func() {
var _ = framework.KubeDescribe("Sysctls [LinuxOnly] [NodeFeature:Sysctls]", func() {
ginkgo.BeforeEach(func() {
// sysctl is not supported on Windows.
framework.SkipIfNodeOSDistroIs("windows")
})
f := framework.NewDefaultFramework("sysctl")
var podClient *framework.PodClient