Automatically run MCS connection scaling interop tests if Java server is in the args, without needing separate flag for it.

Author: kannanjgithub

tools/internal_ci/linux/grpc_interop_tocloud.cfg

@@ -26,5 +26,5 @@ action {
 
 env_vars {
   key: "RUN_TESTS_FLAGS"
-  value: "-l all -s all --use_docker --http2_interop --max_concurrent_streams_connection_scaling -t -j 8 --bq_result_table interop_results --verbose"
+  value: "-l all -s all --use_docker --http2_interop -t -j 8 --bq_result_table interop_results"
 }

tools/run_tests/run_interop_tests.py

@@ -1435,14 +1435,6 @@ def aggregate_http2_results(stdout):
     nargs="?",
     help="Upload test results to a specified BQ table.",
 )
-argp.add_argument(
-    "--max_concurrent_streams_connection_scaling",
-    default=False,
-    action="store_const",
-    const=True,
-    help="Enable Max concurrent streams connection scaling testing",
-)
-
 args = argp.parse_args()
 
 servers = set(
@@ -1480,13 +1472,6 @@ def aggregate_http2_results(stdout):
     )
     sys.exit(1)
 
-if args.max_concurrent_streams_connection_scaling and not args.use_docker:
-    print(
-        "Running interop for max concurrent streams connection scaling is only supported with --use_docker option"
-        " enabled."
-    )
-    sys.exit(1)
-
 # we want to include everything but objc in 'all'
 # because objc won't run on non-mac platforms
 all_but_objc = set(_LANGUAGES) - set(["objc"])
@@ -1818,7 +1803,7 @@ def aggregate_http2_results(stdout):
                     )
                     jobs.append(test_job)
 
-    if args.max_concurrent_streams_connection_scaling:
+    if 'java' in servers:
         languages_for_mcs_cs = set(
             _LANGUAGES[l]
             for l in _LANGUAGES_WITH_HTTP2_CLIENTS_FOR_HTTP2_SERVER_TEST_CASES
@@ -1827,8 +1812,6 @@ def aggregate_http2_results(stdout):
         if not languages_for_mcs_cs:
             print('MCS connection scaling tests will be skipped since none of the supported client languages for MCS connection scaling testcases was specified')
         else:
-            if args.server != 'java':
-                print('Using java for MCS connection scaling server to be used by all MCS connection scaling clients.')
             mcs_server_jobspec = server_jobspec(
                 _LANGUAGES['java'],
                 docker_images.get('java'),