From 36233b985ba413da498e010a569e241bab4a817a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 5 Nov 2021 11:58:12 -0400 Subject: [PATCH] run_remote.go: factor out registerGceHostIP() Prep for future patch. --- test/e2e_node/runner/remote/run_remote.go | 28 ++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index 5f3285120ed..87575b82c49 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -436,28 +436,30 @@ func getImageMetadata(input string) *compute.Metadata { return &ret } -// Run tests in archive against host -func testHost(host string, deleteFiles bool, imageDesc, junitFileName, ginkgoFlagsStr string) *TestResult { +func registerGceHostIP(host string) error { instance, err := computeService.Instances.Get(*project, *zone, host).Do() if err != nil { - return &TestResult{ - err: err, - host: host, - exitOk: false, - } + return err } if strings.ToUpper(instance.Status) != "RUNNING" { - err = fmt.Errorf("instance %s not in state RUNNING, was %s", host, instance.Status) - return &TestResult{ - err: err, - host: host, - exitOk: false, - } + return fmt.Errorf("instance %s not in state RUNNING, was %s", host, instance.Status) } externalIP := getExternalIP(instance) if len(externalIP) > 0 { remote.AddHostnameIP(host, externalIP) } + return nil +} + +// Run tests in archive against host +func testHost(host string, deleteFiles bool, imageDesc, junitFileName, ginkgoFlagsStr string) *TestResult { + if err := registerGceHostIP(host); err != nil { + return &TestResult{ + err: err, + host: host, + exitOk: false, + } + } path, err := arc.getArchive() if err != nil {