github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #25708 from ixdy/node-e2e-test-timeout 

Automatic merge from submit-queue

Add a timeout to the node e2e Ginkgo test runner

Also add a few debugging statements to indicate progress.

Should help prevent #25639, since we'll timeout tests before Jenkins times out the build.
pull/6/head
k8s-merge-robot 2016-05-20 04:42:16 -07:00
parent e851d749e4 83dd910175
commit 97a7d009ad
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/verify-flags/known-flags.txt
View File

@ -419,6 +419,7 @@ system-reserved
target-port target-port
tcp-services tcp-services
terminated-pod-gc-threshold terminated-pod-gc-threshold
test-timeout
tls-cert-file tls-cert-file
tls-private-key-file tls-private-key-file
to-version to-version

6
test/e2e_node/e2e_remote.go
View File

@ -32,6 +32,7 @@ import (
var sshOptions = flag.String("ssh-options", "", "Commandline options passed to ssh.") var sshOptions = flag.String("ssh-options", "", "Commandline options passed to ssh.")
var sshEnv = flag.String("ssh-env", "", "Use predefined ssh options for environment. Options: gce") var sshEnv = flag.String("ssh-env", "", "Use predefined ssh options for environment. Options: gce")
var testTimeoutSeconds = flag.Int("test-timeout", 45*60, "How long (in seconds) to wait for ginkgo tests to complete.")
var sshOptionsMap map[string]string var sshOptionsMap map[string]string
@ -120,6 +121,7 @@ func CreateTestArchive() string {
// RunRemote copies the archive file to a /tmp file on host, unpacks it, and runs the e2e_node.test // RunRemote copies the archive file to a /tmp file on host, unpacks it, and runs the e2e_node.test
func RunRemote(archive string, host string, cleanup bool) (string, error) { func RunRemote(archive string, host string, cleanup bool) (string, error) {
// Create the temp staging directory // Create the temp staging directory
glog.Infof("Staging test binaries on %s", host)
tmp := fmt.Sprintf("/tmp/gcloud-e2e-%d", rand.Int31()) tmp := fmt.Sprintf("/tmp/gcloud-e2e-%d", rand.Int31())
_, err := RunSshCommand("ssh", host, "--", "mkdir", tmp) _, err := RunSshCommand("ssh", host, "--", "mkdir", tmp)
if err != nil { if err != nil {
@ -149,14 +151,16 @@ func RunRemote(archive string, host string, cleanup bool) (string, error) {
// No need to log an error if pkill fails since pkill will fail if the commands are not running. // No need to log an error if pkill fails since pkill will fail if the commands are not running.
// If we are unable to stop existing running k8s processes, we should see messages in the kubelet/apiserver/etcd // If we are unable to stop existing running k8s processes, we should see messages in the kubelet/apiserver/etcd
// logs about failing to bind the required ports. // logs about failing to bind the required ports.
glog.Infof("Killing any existing node processes on %s", host)
RunSshCommand("ssh", host, "--", "sh", "-c", cmd) RunSshCommand("ssh", host, "--", "sh", "-c", cmd)
// Extract the archive and run the tests // Extract the archive and run the tests
cmd = getSshCommand(" && ", cmd = getSshCommand(" && ",
fmt.Sprintf("cd %s", tmp), fmt.Sprintf("cd %s", tmp),
fmt.Sprintf("tar -xzvf ./%s", archiveName), fmt.Sprintf("tar -xzvf ./%s", archiveName),
fmt.Sprintf("./e2e_node.test --logtostderr --v 2 --build-services=false --stop-services=%t --node-name=%s", cleanup, host), fmt.Sprintf("timeout -k 30s %ds ./e2e_node.test --logtostderr --v 2 --build-services=false --stop-services=%t --node-name=%s", *testTimeoutSeconds, cleanup, host),
) )
glog.Infof("Starting tests on %s", host)
output, err := RunSshCommand("ssh", host, "--", "sh", "-c", cmd) output, err := RunSshCommand("ssh", host, "--", "sh", "-c", cmd)
if err != nil { if err != nil {
return "", err return "", err