From bda2519eeb968991abf87a48be447752295985dc Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 16 Mar 2020 03:14:00 -0400
Subject: [PATCH 1/2] mark client_lb_end2end_test as flaky

---
 test/cpp/end2end/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD
index 885cae51ab4..e15f7547ebd 100644
--- a/test/cpp/end2end/BUILD
+++ b/test/cpp/end2end/BUILD
@@ -438,6 +438,7 @@ grpc_cc_test(
     external_deps = [
         "gtest",
     ],
+    flaky = True,  # TODO(b/151315347)
     tags = ["no_windows"],  # TODO(jtattermusch): fix test on windows
     deps = [
         ":test_service_impl",

From 5a92850ca6fa72cd69d40cdb4c7b242c993e9476 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 16 Mar 2020 03:28:45 -0400
Subject: [PATCH 2/2] regenerate projects

---
 Makefile                             |  2 --
 build_autogenerated.yaml             |  1 +
 tools/run_tests/generated/tests.json | 22 ----------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 42be56759d8..505eb0931e5 100644
--- a/Makefile
+++ b/Makefile
@@ -2216,8 +2216,6 @@ test_cxx: buildtests_cxx
 	$(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 client_lb_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/client_lb_end2end_test || ( echo test client_lb_end2end_test failed ; exit 1 )
 	$(E) "[RUN]     Testing codegen_test_full"
 	$(Q) $(BINDIR)/$(CONFIG)/codegen_test_full || ( echo test codegen_test_full failed ; exit 1 )
 	$(E) "[RUN]     Testing codegen_test_minimal"
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index c7e0cfba636..9b149b02037 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -5578,6 +5578,7 @@ targets:
 - name: client_lb_end2end_test
   gtest: true
   build: test
+  run: false
   language: c++
   headers:
   - test/core/util/test_lb_policies.h
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 8e83c9babdb..18623e25aff 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -4199,28 +4199,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_lb_end2end_test", 
-    "platforms": [
-      "linux", 
-      "mac", 
-      "posix"
-    ], 
-    "uses_polling": true
-  }, 
   {
     "args": [], 
     "benchmark": false,