Skip to content

Commit c4f7310

Browse files
committed
Provide a knob to run intree plugin tests
Using this new knob, intree plugin and csi tests can be run together
1 parent 3cd77f8 commit c4f7310

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

test/run-k8s-integration-ci.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ readonly use_gke_managed_driver=${USE_GKE_MANAGED_DRIVER:-false}
2424
readonly gke_release_channel=${GKE_RELEASE_CHANNEL:-""}
2525
readonly teardown_driver=${GCE_PD_TEARDOWN_DRIVER:-true}
2626
readonly gke_node_version=${GKE_NODE_VERSION:-}
27-
27+
readonly run_intree_plugin_tests=${RUN_INTREE_PLUGIN_TESTS:-false}
2828
export GCE_PD_VERBOSITY=9
2929

3030
make -C "${PKGDIR}" test-k8s-integration
@@ -33,9 +33,15 @@ base_cmd="${PKGDIR}/bin/k8s-integration-test \
3333
--run-in-prow=true --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
3434
--do-driver-build=${do_driver_build} --teardown-driver=${teardown_driver} --boskos-resource-type=${boskos_resource_type} \
3535
--storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml --snapshotclass-file=pd-volumesnapshotclass.yaml \
36-
--test-focus='External.Storage' --deployment-strategy=${deployment_strategy} --test-version=${test_version} \
36+
--deployment-strategy=${deployment_strategy} --test-version=${test_version} \
3737
--num-nodes=3 --image-type=${image_type}"
3838

39+
if [ "$run_intree_plugin_tests" = true ]; then
40+
base_cmd="${base_cmd} --test-focus='External.Storage|In-tree.*Driver.*gcepd"
41+
else
42+
base_cmd="${base_cmd} --test-focus='External.Storage"
43+
fi
44+
3945
if [ "$use_gke_managed_driver" = false ]; then
4046
base_cmd="${base_cmd} --deploy-overlay-name=${overlay_name}"
4147
else

0 commit comments

Comments
 (0)