Merge pull request #26461 from pwittrock/fix-25966-nodee2e-junit

test/e2e_node/e2e_remote.go

@@ -125,13 +125,15 @@ func CreateTestArchive() string {
 }
 
 // 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, junitFileNumber int) (string, error) {
+// Returns the command output, whether the exit was ok, and any errors
+func RunRemote(archive string, host string, cleanup bool, junitFileNumber int) (string, bool, error) {
 	// Create the temp staging directory
 	glog.Infof("Staging test binaries on %s", host)
 	tmp := fmt.Sprintf("/tmp/gcloud-e2e-%d", rand.Int31())
 	_, err := RunSshCommand("ssh", host, "--", "mkdir", tmp)
 	if err != nil {
-		return "", err
+		// Exit failure with the error
+		return "", false, err
 	}
 	if cleanup {
 		defer func() {
@@ -145,7 +147,8 @@ func RunRemote(archive string, host string, cleanup bool, junitFileNumber int) (
 	// Copy the archive to the staging directory
 	_, err = RunSshCommand("scp", archive, fmt.Sprintf("%s:%s/", host, tmp))
 	if err != nil {
-		return "", err
+		// Exit failure with the error
+		return "", false, err
 	}
 
 	// Kill any running node processes
@@ -160,27 +163,38 @@ func RunRemote(archive string, host string, cleanup bool, junitFileNumber int) (
 	glog.Infof("Killing any existing node processes on %s", host)
 	RunSshCommand("ssh", host, "--", "sh", "-c", cmd)
 
-	// Extract the archive and run the tests
+	// Extract the archive
+	cmd = getSshCommand(" && ", fmt.Sprintf("cd %s", tmp), fmt.Sprintf("tar -xzvf ./%s", archiveName))
+	glog.Infof("Extracting tar on %s", host)
+	output, err := RunSshCommand("ssh", host, "--", "sh", "-c", cmd)
+	if err != nil {
+		// Exit failure with the error
+		return "", false, err
+	}
+
+	// Run the tests
 	cmd = getSshCommand(" && ",
 		fmt.Sprintf("cd %s", tmp),
-		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{}
+	aggErrs := []error{}
 
 	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 {
-		aggErr = append(aggErr, err)
+		aggErrs = append(aggErrs, err)
 	}
 
 	glog.Infof("Copying test artifacts from %s", host)
 	scpErr := getTestArtifacts(host, tmp)
+	exitOk := true
 	if scpErr != nil {
-		aggErr = append(aggErr, scpErr)
+		// Only exit non-0 if the scp failed
+		exitOk = false
+		aggErrs = append(aggErrs, err)
 	}
 
-	return output, utilerrors.NewAggregate(aggErr)
+	return output, exitOk, utilerrors.NewAggregate(aggErrs)
 }
 
 func getTestArtifacts(host, testDir string) error {

test/e2e_node/runner/run_e2e.go

@@ -52,6 +52,7 @@ type TestResult struct {
 	output string
 	err    error
 	host   string
+	exitOk bool
 }
 
 func main() {
@@ -129,6 +130,7 @@ func main() {
 
 	// Wait for all tests to complete and emit the results
 	errCount := 0
+	exitOk := true
 	for i := 0; i < running; i++ {
 		tr := <-results
 		host := tr.host
@@ -139,11 +141,12 @@ func main() {
 		} else {
 			fmt.Printf("Success Finished Host %s Test Suite\n%s\n", host, tr.output)
 		}
+		exitOk = exitOk && tr.exitOk
 		fmt.Printf("%s================================================================%s\n", blue, noColour)
 	}
 
 	// Set the exit code if there were failures
-	if errCount > 0 {
+	if !exitOk {
 		fmt.Printf("Failure: %d errors encountered.", errCount)
 		os.Exit(1)
 	}
@@ -151,11 +154,12 @@ func main() {
 
 // Run tests in archive against host
 func testHost(host, archive string, deleteFiles bool, junitFileNum int) *TestResult {
-	output, err := e2e_node.RunRemote(archive, host, deleteFiles, junitFileNum)
+	output, exitOk, err := e2e_node.RunRemote(archive, host, deleteFiles, junitFileNum)
 	return &TestResult{
 		output: output,
 		err:    err,
 		host:   host,
+		exitOk: exitOk,
 	}
 }