Merge pull request #26437 from pwittrock/fix-26435

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)]()

test/e2e_node/e2e_remote.go

@@ -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 {
+		aggErr = append(aggErr, err)
+	}
+
+	glog.Infof("Copying test artifacts from %s", host)
 	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, scpErr)
 	}
 
-	err = getTestArtifacts(host, tmp)
-	return output, nil
+	return output, utilerrors.NewAggregate(aggErr)
 }
 
 func getTestArtifacts(host, testDir string) error {