Merge pull request #629 from saikat-royc/run-intree-csi-test

Provide a knob to run intree and csi plugin tests

Author: k8s-ci-robot

test/run-k8s-integration-ci.sh

@@ -24,7 +24,7 @@ readonly use_gke_managed_driver=${USE_GKE_MANAGED_DRIVER:-false}
 readonly gke_release_channel=${GKE_RELEASE_CHANNEL:-""}
 readonly teardown_driver=${GCE_PD_TEARDOWN_DRIVER:-true}
 readonly gke_node_version=${GKE_NODE_VERSION:-}
-
+readonly run_intree_plugin_tests=${RUN_INTREE_PLUGIN_TESTS:-false}
 export GCE_PD_VERBOSITY=9
 
 make -C "${PKGDIR}" test-k8s-integration
@@ -33,9 +33,15 @@ base_cmd="${PKGDIR}/bin/k8s-integration-test \
             --run-in-prow=true --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
             --do-driver-build=${do_driver_build} --teardown-driver=${teardown_driver} --boskos-resource-type=${boskos_resource_type} \
             --storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml --snapshotclass-file=pd-volumesnapshotclass.yaml \
-            --test-focus='External.Storage' --deployment-strategy=${deployment_strategy} --test-version=${test_version} \
+            --deployment-strategy=${deployment_strategy} --test-version=${test_version} \
             --num-nodes=3 --image-type=${image_type}"
 
+if [ "$run_intree_plugin_tests" = true ]; then
+  base_cmd="${base_cmd} --test-focus='External.Storage|In-tree.*Driver.*gcepd"
+else
+  base_cmd="${base_cmd} --test-focus='External.Storage"
+fi
+
 if [ "$use_gke_managed_driver" = false ]; then
   base_cmd="${base_cmd} --deploy-overlay-name=${overlay_name}"
 else