From 1dbda3b147793665f3845367b920637c79b7d0d6 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Fri, 4 Feb 2022 11:46:18 -0800 Subject: [PATCH] xds/interop: move definition of flag force_cleanup so that it is defined in all scripts (#28791) --- tools/run_tests/xds_k8s_test_driver/framework/xds_flags.py | 5 +++++ .../xds_k8s_test_driver/framework/xds_k8s_testcase.py | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/run_tests/xds_k8s_test_driver/framework/xds_flags.py b/tools/run_tests/xds_k8s_test_driver/framework/xds_flags.py index efb68563ff5..7c728859671 100644 --- a/tools/run_tests/xds_k8s_test_driver/framework/xds_flags.py +++ b/tools/run_tests/xds_k8s_test_driver/framework/xds_flags.py @@ -123,6 +123,11 @@ TESTING_VERSION = flags.DEFINE_string( default="master", help="The testing gRPC version branch name. Like master, v1.41.x, v1.37.x") +FORCE_CLEANUP = flags.DEFINE_bool( + "force_cleanup", + default=False, + help="Force resource cleanup, even if not created by this test run") + flags.adopt_module_key_flags(highlighter) flags.mark_flags_as_required([ diff --git a/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py b/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py index a9fa37a0d88..6096e5fdcb1 100644 --- a/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py +++ b/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py @@ -39,10 +39,6 @@ from framework.test_app import client_app from framework.test_app import server_app logger = logging.getLogger(__name__) -_FORCE_CLEANUP = flags.DEFINE_bool( - "force_cleanup", - default=False, - help="Force resource cleanup, even if not created by this test run") # TODO(yashkt): We will no longer need this flag once Core exposes local certs # from channelz _CHECK_LOCAL_CERTS = flags.DEFINE_bool( @@ -117,7 +113,7 @@ class XdsKubernetesTestCase(absltest.TestCase, metaclass=abc.ABCMeta): cls.client_port = xds_flags.CLIENT_PORT.value # Test suite settings - cls.force_cleanup = _FORCE_CLEANUP.value + cls.force_cleanup = xds_flags.FORCE_CLEANUP.value cls.debug_use_port_forwarding = \ xds_k8s_flags.DEBUG_USE_PORT_FORWARDING.value cls.enable_workload_identity = xds_k8s_flags.ENABLE_WORKLOAD_IDENTITY.value