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

tests: Combine Linux / Windows image pulling tests

Browse Source 
Because Linux images cannot run on Windows and vice-versa, separate
tests were added for both OSes, only separated by a [LinuxOnly] tag
in their names.

Based on the given --node-os-distro, we can select which image to
use when spawning the pod.
This commit is contained in:
Claudiu Belu 2019-04-08 16:14:40 -07:00
parent 70b46ca5fb
commit e3774b85b2
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/e2e/common/runtime.go
View File

@ -363,27 +363,25 @@ while true; do sleep 1; done
imagePullTest(image, false, v1.PodPending, true, false)
})
ginkgo.It("should be able to pull image from gcr.io [LinuxOnly] [NodeConformance]", func() {
image := imageutils.GetE2EImage(imageutils.DebianBase)
imagePullTest(image, false, v1.PodRunning, false, false)
})
ginkgo.It("should be able to pull image from gcr.io [NodeConformance]", func() {
framework.SkipUnlessNodeOSDistroIs("windows")
image := imageutils.GetE2EImage(imageutils.WindowsNanoServer)
imagePullTest(image, false, v1.PodRunning, false, true)
})
ginkgo.It("should be able to pull image from docker hub [LinuxOnly] [NodeConformance]", func() {
image := imageutils.GetE2EImage(imageutils.Alpine)
imagePullTest(image, false, v1.PodRunning, false, false)
image := imageutils.GetE2EImage(imageutils.DebianBase)
isWindows := false
if framework.NodeOSDistroIs("windows") {
image = imageutils.GetE2EImage(imageutils.WindowsNanoServer)
isWindows = true
}
imagePullTest(image, false, v1.PodRunning, false, isWindows)
})
ginkgo.It("should be able to pull image from docker hub [NodeConformance]", func() {
framework.SkipUnlessNodeOSDistroIs("windows")
// TODO(claudiub): Switch to nanoserver image manifest list.
image := "e2eteam/busybox:1.29"
imagePullTest(image, false, v1.PodRunning, false, true)
image := imageutils.GetE2EImage(imageutils.Alpine)
isWindows := false
if framework.NodeOSDistroIs("windows") {
// TODO(claudiub): Switch to nanoserver image manifest list.
image = "e2eteam/busybox:1.29"
isWindows = true
}
imagePullTest(image, false, v1.PodRunning, false, isWindows)
})
ginkgo.It("should not be able to pull from private registry without secret [NodeConformance]", func() {
@ -391,15 +389,14 @@ while true; do sleep 1; done
imagePullTest(image, false, v1.PodPending, true, false)
})
ginkgo.It("should be able to pull from private registry with secret [LinuxOnly] [NodeConformance]", func() {
image := imageutils.GetE2EImage(imageutils.AuthenticatedAlpine)
imagePullTest(image, true, v1.PodRunning, false, false)
})
ginkgo.It("should be able to pull from private registry with secret [NodeConformance]", func() {
framework.SkipUnlessNodeOSDistroIs("windows")
image := imageutils.GetE2EImage(imageutils.AuthenticatedWindowsNanoServer)
imagePullTest(image, true, v1.PodRunning, false, true)
image := imageutils.GetE2EImage(imageutils.AuthenticatedAlpine)
isWindows := false
if framework.NodeOSDistroIs("windows") {
image = imageutils.GetE2EImage(imageutils.AuthenticatedWindowsNanoServer)
isWindows = true
}
imagePullTest(image, true, v1.PodRunning, false, isWindows)
})
})
})