github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-29 12:49:55 +00:00
Code Issues Projects Releases Wiki Activity

Port Guestbook tests to mutiarch

Browse Source
This commit is contained in:
Manjunath A Kumatagi
2017-09-09 11:18:38 +05:30
parent 42e2ca8c18
commit 96c0945e69
8 changed files with 144 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/kubectl/kubectl.go
View File

@@ -99,21 +99,21 @@ var (
)
var testImages = struct {
FrontendImage string
GBFrontendImage string
PauseImage string
NginxSlimImage string
NginxSlimNewImage string
RedisImage string
RedisslaveImage string
GBRedisSlaveImage string
NautilusImage string
KittenImage string
}{
imageutils.GetE2EImage(imageutils.Frontend),
imageutils.GetE2EImage(imageutils.GBFrontend),
imageutils.GetE2EImage(imageutils.Pause),
imageutils.GetE2EImage(imageutils.NginxSlim),
imageutils.GetE2EImage(imageutils.NginxSlimNew),
imageutils.GetE2EImage(imageutils.Redis),
imageutils.GetE2EImage(imageutils.Redisslave),
imageutils.GetE2EImage(imageutils.GBRedisSlave),
imageutils.GetE2EImage(imageutils.Nautilus),
imageutils.GetE2EImage(imageutils.Kitten),
}
@@ -340,16 +340,17 @@ var _ = SIGDescribe("Kubectl client", func() {
framework.KubeDescribe("Guestbook application", func() {
forEachGBFile := func(run func(s string)) {
guestbookRoot := "test/e2e/testing-manifests/guestbook"
for _, gbAppFile := range []string{
"examples/guestbook/frontend-deployment.yaml",
"examples/guestbook/frontend-service.yaml",
"examples/guestbook/redis-master-deployment.yaml",
"examples/guestbook/redis-master-service.yaml",
"examples/guestbook/redis-slave-deployment.yaml",
"examples/guestbook/redis-slave-service.yaml",
"frontend-deployment.yaml.in",
"frontend-service.yaml",
"redis-master-deployment.yaml.in",
"redis-master-service.yaml",
"redis-slave-deployment.yaml.in",
"redis-slave-service.yaml",
} {
contents := generated.ReadOrDie(gbAppFile)
run(string(contents))
contents := substituteImageName(string(generated.ReadOrDie(filepath.Join(guestbookRoot, gbAppFile))))
run(contents)
}
}