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

Merge pull request #77518 from bclau/tests/image-pulling

Browse Source 
tests: Combine Linux / Windows image pulling tests
This commit is contained in:
Kubernetes Prow Robot 2019-06-14 16:50:09 -07:00 committed by GitHub
commit 231e869693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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