From 49e9ef2e394aeb0cc32a49d9be3bbc3be47ca0bb Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Thu, 24 Jun 2021 18:06:38 -0400 Subject: [PATCH] xds-k8s: fix a bug with ordering flags in run.sh (#26550) Append run.sh arguments after the flagfile, so they it's possible to override flags set in the flagfile. --- tools/run_tests/xds_k8s_test_driver/run.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/run_tests/xds_k8s_test_driver/run.sh b/tools/run_tests/xds_k8s_test_driver/run.sh index 160faa30f0e..2914a4f9ad6 100755 --- a/tools/run_tests/xds_k8s_test_driver/run.sh +++ b/tools/run_tests/xds_k8s_test_driver/run.sh @@ -68,4 +68,8 @@ fi cd "${XDS_K8S_DRIVER_DIR}" export PYTHONPATH="${XDS_K8S_DRIVER_DIR}" -exec python "$@" --flagfile="${XDS_K8S_CONFIG}" +# Split path to python file from the rest of the args. +readonly PY_FILE="$1" +shift +# Append args after --flagfile, so they take higher priority. +exec python "${PY_FILE}" --flagfile="${XDS_K8S_CONFIG}" "$@"