Merge pull request #551 from jingxu97/June/windowstest

Update CI test configuration

Author: k8s-ci-robot

test/k8s-integration/driver.go

@@ -71,9 +71,8 @@ func installDriver(goPath, pkgDir, stagingImage, stagingVersion, deployOverlayNa
 	statusCmd := exec.Command("kubectl", "describe", "pods", "-n", driverNamespace)
 	err = runCommand("Checking driver pods", statusCmd)
 	if err != nil {
-		return fmt.Errorf("failed to check driver pods: %v", err)
+		return fmt.Errorf("failed to describe pods: %v", err)
 	}
-
 	return nil
 }
 

test/k8s-integration/main.go

@@ -298,6 +298,23 @@ func handle() error {
 			}
 		}()
 	}
+	// For windows cluster, when cluster is up, all Windows nodes are tainted with NoSchedule to avoid linux pods
+	// being scheduled to Windows nodes. When running windows tests, we need to remove the taint.
+	if *platform == "windows" {
+		nodesCmd := exec.Command("kubectl", "get", "nodes", "-l", "beta.kubernetes.io/os=windows", "-o", "name")
+		out, err := nodesCmd.CombinedOutput()
+		if err != nil {
+			return fmt.Errorf("failed to get nodes: %v", err)
+		}
+		nodes := strings.Fields(string(out))
+		for _, node := range nodes {
+			taintCmd := exec.Command("kubectl", "taint", "node", node, "node.kubernetes.io/os:NoSchedule-")
+			_, err = taintCmd.CombinedOutput()
+			if err != nil {
+				return fmt.Errorf("failed to untaint windows node %v", err)
+			}
+		}
+	}
 
 	if !*useGKEManagedDriver {
 		// Install the driver and defer its teardown

test/run-windows-k8s-integration.sh

@@ -9,22 +9,20 @@
 set -o nounset
 set -o errexit
 
-readonly GCE_PD_DO_DRIVER_BUILD=false
 readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
-readonly LOCAL_K8S_DIR=${GOPATH}/src/k8s.io/kubernetes
 readonly overlay_name="${GCE_PD_OVERLAY_NAME:-alpha}"
 readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
 readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
 readonly test_version=${TEST_VERSION:-master}
 readonly gce_zone=${GCE_CLUSTER_ZONE:-us-central1-b}
-readonly teardown_driver=${GCE_CLUSTER_ZONE:-true}
+readonly teardown_driver=${GCE_PD_TEARDOWN_DRIVER:-true}
 
 make -C ${PKGDIR} test-k8s-integration
 
 base_cmd="${PKGDIR}/bin/k8s-integration-test \
-            --platform=windows --local-k8s-dir=${LOCAL_K8S_DIR} --bringup-cluster=false --teardown-cluster=false --teardown-driver=${teardown_driver}\
+            --platform=windows --bringup-cluster=false --teardown-cluster=false --teardown-driver=${teardown_driver}\
             --run-in-prow=true --deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
-            --do-driver-build=${do_driver_build} --gce-zone=${gce_zone}\
+            --do-driver-build=${do_driver_build} --gce-zone=${gce_zone} --test-version=${test_version}\
             --storageclass-file=sc-windows.yaml --snapshotclass-file=pd-volumesnapshotclass.yaml --test-focus="External.Storage" \
             --deployment-strategy=${deployment_strategy}"