Merge pull request #103640 from saschagrunert/crictl-host-local-test

Make crictl tests host local
This commit is contained in:
Kubernetes Prow Robot 2021-08-06 07:33:19 -07:00 committed by GitHub
commit 3670029b3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,11 +18,11 @@ package node
import ( import (
"fmt" "fmt"
"strings"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" 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" "github.com/onsi/ginkgo"
) )
@ -33,42 +33,28 @@ var _ = SIGDescribe("crictl", func() {
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
// `crictl` is not available on all cloud providers. // `crictl` is not available on all cloud providers.
e2eskipper.SkipUnlessProviderIs("gce", "gke") 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() { ginkgo.It("should be able to run crictl on the node", func() {
// Get all nodes' external IPs. nodes, err := e2enode.GetBoundedReadySchedulableNodes(f.ClientSet, maxNodes)
ginkgo.By("Getting all nodes' SSH-able IP addresses") framework.ExpectNoError(err)
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")
testCases := []struct { testCases := []string{
cmd string "crictl version",
}{ "crictl info",
{`sudo crictl version`},
{`sudo crictl info`},
} }
hostExec := utils.NewHostExec(f)
for _, testCase := range testCases { for _, testCase := range testCases {
for _, host := range hosts { for _, node := range nodes.Items {
ginkgo.By(fmt.Sprintf("SSH'ing to node %q to run %q", host, testCase.cmd)) ginkgo.By(fmt.Sprintf("Testing %q on node %q ", testCase, node.GetName()))
result, err := e2essh.SSH(testCase.cmd, host, framework.TestContext.Provider) res, err := hostExec.Execute(testCase, &node)
stdout, stderr := strings.TrimSpace(result.Stdout), strings.TrimSpace(result.Stderr) framework.ExpectNoError(err)
if err != nil {
framework.Failf("Ran %q on %q, got error %v", testCase.cmd, host, err) if res.Stdout == "" && res.Stderr == "" {
} framework.Fail("output is empty")
// 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))
} }
} }
} }