From 7bedba8c45e996aaa1718b02457a644219ff7ea0 Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Thu, 24 Sep 2015 08:22:43 -0700
Subject: [PATCH] Disable zookeeper test for now

---
 Makefile                   |  2 --
 build.yaml                 |  1 +
 tools/run_tests/tests.json | 12 ------------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index d44f81c8609..c3ee4414000 100644
--- a/Makefile
+++ b/Makefile
@@ -3374,8 +3374,6 @@ flaky_test_cxx: buildtests_cxx
 
 ifeq ($(HAS_ZOOKEEPER),true)
 test_zookeeper: buildtests_zookeeper
-	$(E) "[RUN]     Testing zookeeper_test"
-	$(Q) $(BINDIR)/$(CONFIG)/zookeeper_test || ( echo test zookeeper_test failed ; exit 1 )
 
 
 flaky_test_zookeeper: buildtests_zookeeper
diff --git a/build.yaml b/build.yaml
index 527b7d59449..7ab70485c5a 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1003,6 +1003,7 @@ targets:
   deps: [grpc++_test_util, grpc_test_util, grpc++, grpc, gpr_test_util, gpr]
 - name: zookeeper_test
   build: test
+  run: false
   language: c++
   src: [test/cpp/end2end/zookeeper_test.cc]
   deps: [grpc++_test_util, grpc_test_util, grpc++, grpc_zookeeper, grpc, gpr_test_util,
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index df251a2b8eb..ebdd52f0af9 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -1647,18 +1647,6 @@
       "windows"
     ]
   }, 
-  {
-    "ci_platforms": [
-      "linux"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c++", 
-    "name": "zookeeper_test", 
-    "platforms": [
-      "linux"
-    ]
-  }, 
   {
     "ci_platforms": [
       "linux",