Put ARCH inline with make command, andd vmName as flag

Author: dannawang0221

Makefile

@@ -45,7 +45,9 @@ gce-pd-driver: require-GCE_PD_CSI_STAGING_VERSION
 gce-pd-driver-windows: require-GCE_PD_CSI_STAGING_VERSION
 ifeq ($(ARCH), amd64)
 	mkdir -p bin
-	GOOS=windows go build -mod=vendor -ldflags -X=main.version=$(STAGINGVERSION) -o bin/${DRIVERWINDOWSBINARY} ./cmd/gce-pd-csi-driver/
+	GOOS=windows GOARCH=$(ARCH) go build -mod=vendor -ldflags -X=main.version=$(STAGINGVERSION) -o bin/${DRIVERWINDOWSBINARY} ./cmd/gce-pd-csi-driver/
+else
+  echo "Warning: gcp-pd-driver-windows only supports ARCH=amd64."
 endif
 
 build-container: require-GCE_PD_CSI_STAGING_IMAGE require-GCE_PD_CSI_STAGING_VERSION init-buildx

test/e2e/tests/setup_e2e_test.go

@@ -35,6 +35,7 @@ import (
 var (
 	project         = flag.String("project", "", "Project to run tests in")
 	architecture    = flag.String("arch", "amd64", "Architecture pd csi driver build on")
+	vmName          = flag.String("vm-name", "", "Name of the VM to run tests on")
 	serviceAccount  = flag.String("service-account", "", "Service account to bring up instance with")
 	runInProw       = flag.Bool("run-in-prow", false, "If true, use a Boskos loaned project and special CI service accounts and ssh keys")
 	deleteInstances = flag.Bool("delete-instances", false, "Delete the instances after tests run")
@@ -87,7 +88,7 @@ var _ = BeforeSuite(func() {
 	for _, zone := range zones {
 		go func(curZone string) {
 			defer GinkgoRecover()
-			nodeID := fmt.Sprintf("gce-pd-csi-e2e-%s", curZone)
+			nodeID := getNodeId(*vmName, curZone)
 			klog.Infof("Setting up node %s\n", nodeID)
 
 			i, err := remote.SetupInstance(*project, *architecture, curZone, nodeID, *serviceAccount, computeService)
@@ -143,3 +144,10 @@ func getRandomTestContext() *remote.TestContext {
 	rn := rand.Intn(len(testContexts))
 	return testContexts[rn]
 }
+
+func getNodeId(vmName, curZone string) string {
+	if vmName == "" {
+		return fmt.Sprintf("gce-pd-csi-e2e-%s", curZone)
+	}
+	return vmName
+}

test/remote/archiver.go

@@ -55,8 +55,7 @@ func CreateDriverArchive(archiveName, architecture, pkgPath, binPath string) (st
 
 func setupBinaries(architecture, tarDir, pkgPath, binPath string) error {
 	klog.V(4).Infof("Making binaries and copying to temp dir...")
-	os.Setenv("ARCH", architecture)
-	out, err := exec.Command("make", "-C", pkgPath).CombinedOutput()
+	out, err := exec.Command("make", "-C", pkgPath, "ARCH="+architecture).CombinedOutput()
 	if err != nil {
 		return fmt.Errorf("Failed to make at %s: %v: %v", pkgPath, string(out), err)
 	}