Merge pull request #256 from davidz627/feature/featureGates

Add feature gate setting & required test focus flag to integration tests

Author: k8s-ci-robot

test/k8s-integration/main.go

@@ -43,6 +43,8 @@ var (
 	doDriverBuild      = flag.Bool("do-driver-build", true, "building the driver from source")
 	boskosResourceType = flag.String("boskos-resource-type", "gce-project", "name of the boskos resource type to reserve")
 	storageClassFile   = flag.String("storageclass-file", "", "name of storageclass yaml file to use for test relative to test/k8s-integration/config")
+	kubeFeatureGates   = flag.String("kube-feature-gates", "", "feature gates to set on new kubernetes cluster")
+	testFocus          = flag.String("test-focus", "", "test focus for Kubernetes e2e")
 )
 
 const (
@@ -72,6 +74,14 @@ func main() {
 		glog.Fatalf("storageclass-file is a required flag")
 	}
 
+	if !*bringupCluster && len(*kubeFeatureGates) > 0 {
+		glog.Fatalf("kube-feature-gates set but not bringing up new cluster")
+	}
+
+	if len(*testFocus) == 0 {
+		glog.Fatalf("test-focus is a required flag")
+	}
+
 	err := handle()
 	if err != nil {
 		glog.Fatalf("Failed to run integration test: %v", err)
@@ -161,6 +171,14 @@ func handle() error {
 			glog.Errorf("could not find cluster kubectl at %s, falling back to default kubectl", kshPath)
 		}
 
+		if len(*kubeFeatureGates) != 0 {
+			err = os.Setenv("KUBE_FEATURE_GATES", *kubeFeatureGates)
+			if err != nil {
+				return fmt.Errorf("failed to set kubernetes feature gates: %v", err)
+			}
+			glog.V(4).Infof("Set Kubernetes feature gates: %v", *kubeFeatureGates)
+		}
+
 		err = clusterUp(k8sDir)
 		if err != nil {
 			return fmt.Errorf("failed to cluster up: %v", err)
@@ -192,7 +210,7 @@ func handle() error {
 	if len(*localK8sDir) != 0 {
 		k8sDir = *localK8sDir
 	}
-	err = runTests(pkgDir, k8sDir, *storageClassFile)
+	err = runTests(pkgDir, k8sDir, *storageClassFile, *testFocus)
 	if err != nil {
 		return fmt.Errorf("failed to run tests: %v", err)
 	}
@@ -213,7 +231,7 @@ func setEnvProject(project string) error {
 	return nil
 }
 
-func runTests(pkgDir, k8sDir, storageClassFile string) error {
+func runTests(pkgDir, k8sDir, storageClassFile, testFocus string) error {
 	testDriverConfigFile, err := generateDriverConfigFile(pkgDir, storageClassFile)
 	if err != nil {
 		return err
@@ -231,10 +249,11 @@ func runTests(pkgDir, k8sDir, storageClassFile string) error {
 	reportArg := fmt.Sprintf("-report-dir=%s", artifactsDir)
 
 	driverConfigArg := fmt.Sprintf("-storage.testdriver=%s", testDriverConfigFile)
+	testFocusArg := fmt.Sprintf("-focus=%s", testFocus)
 
 	cmd := exec.Command(filepath.Join(k8sBuildBinDir, "ginkgo"),
 		"-p",
-		"-focus=External.Storage",
+		testFocusArg,
 		"-skip=\\[Disruptive\\]|\\[Serial\\]|\\[Feature:.+\\]",
 		filepath.Join(k8sBuildBinDir, "e2e.test"),
 		"--",

test/run-k8s-integration-local.sh

@@ -10,7 +10,7 @@ ensure_var GCE_PD_CSI_STAGING_IMAGE
 ensure_var GCE_PD_SA_DIR
 
 make -C ${PKGDIR} test-k8s-integration
-${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false --staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json --deploy-overlay-name=dev --storageclass-file=sc-standard.yaml
+${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false --staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json --deploy-overlay-name=dev --storageclass-file=sc-standard.yaml --test-focus="External.Storage"
 
 # This version of the command does not build the driver or K8s, points to a
 # local K8s repo to get the e2e.test binary, and does not bring up or down the cluster

test/run-k8s-integration.sh

@@ -16,4 +16,4 @@ readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
 export GCE_PD_VERBOSITY=9
 
 make -C ${PKGDIR} test-k8s-integration
-${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=true --deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} --do-driver-build=${do_driver_build} --boskos-resource-type=${boskos_resource_type} --storageclass-file=sc-standard.yaml
+${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=true --deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} --do-driver-build=${do_driver_build} --boskos-resource-type=${boskos_resource_type} --storageclass-file=sc-standard.yaml --test-focus="External.Storage"