From 697f411fef03c1ef296f0e4efa686e3621213f05 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 9 Apr 2020 10:05:07 -0400
Subject: [PATCH] mark client_channel_stress_test as flaky

---
 Makefile                             |  2 --
 build_autogenerated.yaml             |  1 +
 test/cpp/client/BUILD                |  1 +
 tools/run_tests/generated/tests.json | 22 ----------------------
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index d1a58c87a8b..3c912074365 100644
--- a/Makefile
+++ b/Makefile
@@ -2204,8 +2204,6 @@ test_cxx: buildtests_cxx
 	$(Q) $(BINDIR)/$(CONFIG)/cli_call_test || ( echo test cli_call_test failed ; exit 1 )
 	$(E) "[RUN]     Testing client_callback_end2end_test"
 	$(Q) $(BINDIR)/$(CONFIG)/client_callback_end2end_test || ( echo test client_callback_end2end_test failed ; exit 1 )
-	$(E) "[RUN]     Testing client_channel_stress_test"
-	$(Q) $(BINDIR)/$(CONFIG)/client_channel_stress_test || ( echo test client_channel_stress_test failed ; exit 1 )
 	$(E) "[RUN]     Testing client_interceptors_end2end_test"
 	$(Q) $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test || ( echo test client_interceptors_end2end_test failed ; exit 1 )
 	$(E) "[RUN]     Testing codegen_test_full"
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 69e0b124799..3da4665b127 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -5511,6 +5511,7 @@ targets:
 - name: client_channel_stress_test
   gtest: true
   build: test
+  run: false
   language: c++
   headers:
   - test/cpp/end2end/test_service_impl.h
diff --git a/test/cpp/client/BUILD b/test/cpp/client/BUILD
index 73b0aa37457..18e9ce4973f 100644
--- a/test/cpp/client/BUILD
+++ b/test/cpp/client/BUILD
@@ -35,6 +35,7 @@ grpc_cc_test(
 grpc_cc_test(
     name = "client_channel_stress_test",
     srcs = ["client_channel_stress_test.cc"],
+    flaky = True,  # TODO(b/153136407)
     # TODO(jtattermusch): test fails frequently on Win RBE, but passes locally
     # reenable the tests once it works reliably on Win RBE.
     # TODO(roth): Test disabled on msan and tsan due to variable
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index fc5695d84a3..7bc5d2575a9 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -4077,28 +4077,6 @@
     ], 
     "uses_polling": true
   }, 
-  {
-    "args": [], 
-    "benchmark": false, 
-    "ci_platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "cpu_cost": 1.0, 
-    "exclude_configs": [], 
-    "exclude_iomgrs": [], 
-    "flaky": false, 
-    "gtest": true, 
-    "language": "c++", 
-    "name": "client_channel_stress_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "uses_polling": true
-  }, 
   {
     "args": [], 
     "benchmark": false,