From a65d20750723f95349f344e31f952ef3156596b6 Mon Sep 17 00:00:00 2001 From: upodroid Date: Wed, 26 Jul 2023 23:10:06 +0000 Subject: [PATCH] calculate the correct machine-type --- test/e2e_node/remote/gce/gce_runner.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/e2e_node/remote/gce/gce_runner.go b/test/e2e_node/remote/gce/gce_runner.go index a94238691cf..acd4d5beae5 100644 --- a/test/e2e_node/remote/gce/gce_runner.go +++ b/test/e2e_node/remote/gce/gce_runner.go @@ -768,12 +768,15 @@ func (g *GCERunner) updateKernelArguments(instance *compute.Instance, image stri } func (g *GCERunner) machineType(machine string) string { + var ret string if machine == "" && *instanceType != "" { - machine = *instanceType + ret = *instanceType + } else if machine != "" { + ret = machine } else { - machine = defaultGCEMachine + ret = defaultGCEMachine } - return fmt.Sprintf("zones/%s/machineTypes/%s", *zone, machine) + return fmt.Sprintf("zones/%s/machineTypes/%s", *zone, ret) } func (g *GCERunner) rebootInstance(instance *compute.Instance) error { // wait until the instance will not response to SSH