Commit ea07d310 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #26604 from zmerlynn/ssh-slow

Automatic merge from submit-queue SSH e2e: Limit to 100 nodes, limit combinatorics [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()This limits the "for all hosts" to 100 nodes, and also limits the combinatorial section so that we only do the other SSH command variant testing on the first host rather than *all* of the hosts. I also killed one of the variants because it didn't seem to be testing much important. Fixes #26600
parents 0a6a52b1 3d66c3be
......@@ -25,6 +25,8 @@ import (
. "github.com/onsi/ginkgo"
)
const maxNodes = 100
var _ = framework.KubeDescribe("SSH", func() {
f := framework.NewDefaultFramework("ssh")
......@@ -50,17 +52,27 @@ var _ = framework.KubeDescribe("SSH", func() {
expectedCode int
expectedError error
}{
{`echo "Hello"`, true, "Hello", "", 0, nil},
// Same as previous, but useful for test output diagnostics.
// Keep this test first - this variant runs on all nodes.
{`echo "Hello from $(whoami)@$(hostname)"`, false, "", "", 0, nil},
{`echo "foo" | grep "bar"`, true, "", "", 1, nil},
{`echo "Out" && echo "Error" >&2 && exit 7`, true, "Out", "Error", 7, nil},
}
// Run commands on all nodes via SSH.
for _, testCase := range testCases {
By(fmt.Sprintf("SSH'ing to all nodes and running %s", testCase.cmd))
for _, host := range hosts {
for i, testCase := range testCases {
// Only run the first testcase against max 100 nodes. Run
// the rest against the first node we find only, since
// they're basically testing SSH semantics (and we don't
// need to do that against each host in the cluster).
nodes := len(hosts)
if i > 0 {
nodes = 1
} else if nodes > maxNodes {
nodes = maxNodes
}
testhosts := hosts[:nodes]
By(fmt.Sprintf("SSH'ing to %d nodes and running %s", len(testhosts), testCase.cmd))
for _, host := range testhosts {
result, err := framework.SSH(testCase.cmd, host, framework.TestContext.Provider)
stdout, stderr := strings.TrimSpace(result.Stdout), strings.TrimSpace(result.Stderr)
if err != testCase.expectedError {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment