mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #103640 from saschagrunert/crictl-host-local-test
Make crictl tests host local
This commit is contained in:
commit
3670029b3d
@ -18,11 +18,11 @@ package node
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
|
||||
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
||||
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
|
||||
"k8s.io/kubernetes/test/e2e/storage/utils"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
)
|
||||
@ -33,42 +33,28 @@ var _ = SIGDescribe("crictl", func() {
|
||||
ginkgo.BeforeEach(func() {
|
||||
// `crictl` is not available on all cloud providers.
|
||||
e2eskipper.SkipUnlessProviderIs("gce", "gke")
|
||||
// The test requires $HOME/.ssh/id_rsa key to be present.
|
||||
e2eskipper.SkipUnlessSSHKeyPresent()
|
||||
})
|
||||
|
||||
ginkgo.It("should be able to run crictl on the node", func() {
|
||||
// Get all nodes' external IPs.
|
||||
ginkgo.By("Getting all nodes' SSH-able IP addresses")
|
||||
hosts, err := e2essh.NodeSSHHosts(f.ClientSet)
|
||||
if err != nil {
|
||||
framework.Failf("Error getting node hostnames: %v", err)
|
||||
}
|
||||
e2eskipper.SkipUnlessAtLeast(len(hosts), 1, "Skipping test because found no SSH'able node")
|
||||
nodes, err := e2enode.GetBoundedReadySchedulableNodes(f.ClientSet, maxNodes)
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
testCases := []struct {
|
||||
cmd string
|
||||
}{
|
||||
{`sudo crictl version`},
|
||||
{`sudo crictl info`},
|
||||
testCases := []string{
|
||||
"crictl version",
|
||||
"crictl info",
|
||||
}
|
||||
|
||||
hostExec := utils.NewHostExec(f)
|
||||
|
||||
for _, testCase := range testCases {
|
||||
for _, host := range hosts {
|
||||
ginkgo.By(fmt.Sprintf("SSH'ing to node %q to run %q", host, testCase.cmd))
|
||||
for _, node := range nodes.Items {
|
||||
ginkgo.By(fmt.Sprintf("Testing %q on node %q ", testCase, node.GetName()))
|
||||
|
||||
result, err := e2essh.SSH(testCase.cmd, host, framework.TestContext.Provider)
|
||||
stdout, stderr := strings.TrimSpace(result.Stdout), strings.TrimSpace(result.Stderr)
|
||||
if err != nil {
|
||||
framework.Failf("Ran %q on %q, got error %v", testCase.cmd, host, err)
|
||||
}
|
||||
// Log the stdout/stderr output.
|
||||
// TODO: Verify the output.
|
||||
if len(stdout) > 0 {
|
||||
framework.Logf("Got stdout from %q:\n %s\n", host, strings.TrimSpace(stdout))
|
||||
}
|
||||
if len(stderr) > 0 {
|
||||
framework.Logf("Got stderr from %q:\n %s\n", host, strings.TrimSpace(stderr))
|
||||
res, err := hostExec.Execute(testCase, &node)
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
if res.Stdout == "" && res.Stderr == "" {
|
||||
framework.Fail("output is empty")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user