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

Merge pull request #26437 from pwittrock/fix-26435

Browse Source 
Automatic merge from submit-queue

Node e2e - Fix issue where error in scp is not return.  Fixes #26435



[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot 2016-05-29 19:08:59 -07:00
commit 023f11dc10
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e_node/e2e_remote.go
View File

@ -166,21 +166,21 @@ func RunRemote(archive string, host string, cleanup bool, junitFileNumber int) (
fmt.Sprintf("tar -xzvf ./%s", archiveName),
fmt.Sprintf("timeout -k 30s %ds ./e2e_node.test --logtostderr --v 2 --build-services=false --stop-services=%t --node-name=%s --report-dir=%s/results --junit-file-number=%d %s", *testTimeoutSeconds, cleanup, host, tmp, junitFileNumber, *ginkgoFlags),
)
aggErr := []error{}
glog.Infof("Starting tests on %s", host)
output, err := RunSshCommand("ssh", host, "--", "sh", "-c", cmd)
if err != nil {
scpErr := getTestArtifacts(host, tmp)
// Return both the testing and scp error
if scpErr != nil {
return "", utilerrors.NewAggregate([]error{err, scpErr})
}
return "", err
aggErr = append(aggErr, err)
}
err = getTestArtifacts(host, tmp)
return output, nil
glog.Infof("Copying test artifacts from %s", host)
scpErr := getTestArtifacts(host, tmp)
if scpErr != nil {
aggErr = append(aggErr, scpErr)
}
return output, utilerrors.NewAggregate(aggErr)
}
func getTestArtifacts(host, testDir string) error {