github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Factor out providers which support SSH in e2e tests

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2015-09-29 10:53:54 +02:00
parent b9cfab87e3
commit a68e0848dc
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/core.go
View File

@ -38,7 +38,7 @@ func CoreDump(dir string) {
provider := testContext.Provider provider := testContext.Provider
// requires ssh // requires ssh
if !providerIs("gce", "gke") { if !providerIs(providersWithSSH...) {
fmt.Printf("Skipping SSH core dump, which is not implemented for %s", provider) fmt.Printf("Skipping SSH core dump, which is not implemented for %s", provider)
return return
} }

2
test/e2e/service.go
View File

@ -238,7 +238,7 @@ var _ = Describe("Services", func() {
It("should be able to up and down services", func() { It("should be able to up and down services", func() {
// this test uses NodeSSHHosts that does not work if a Node only reports LegacyHostIP // this test uses NodeSSHHosts that does not work if a Node only reports LegacyHostIP
SkipUnlessProviderIs("gce", "gke", "aws") SkipUnlessProviderIs(providersWithSSH...)
ns := namespaces[0] ns := namespaces[0]
numPods, servicePort := 3, 80 numPods, servicePort := 3, 80

2
test/e2e/ssh.go
View File

@ -35,7 +35,7 @@ var _ = Describe("SSH", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// When adding more providers here, also implement their functionality in util.go's getSigner(...). // When adding more providers here, also implement their functionality in util.go's getSigner(...).
SkipUnlessProviderIs("gce", "gke") SkipUnlessProviderIs(providersWithSSH...)
}) })
It("should SSH to all nodes and run commands", func() { It("should SSH to all nodes and run commands", func() {

3
test/e2e/util.go
View File

@ -241,6 +241,9 @@ func providerIs(providers ...string) bool {
return false return false
} }
// providersWithSSH are those providers where each node is accessible with SSH
var providersWithSSH = []string{"gce", "gke", "aws"}
type podCondition func(pod *api.Pod) (bool, error) type podCondition func(pod *api.Pod) (bool, error)
// podReady returns whether pod has a condition of Ready with a status of true. // podReady returns whether pod has a condition of Ready with a status of true.