commit 6ce6166bd0451db14893b896384517bb95fbfea3
author Eric Gribkoff <ericgribkoff@google.com> Thu Mar 16 10:27:00 2017 -0700
committer Eric Gribkoff <ericgribkoff@google.com> Fri Mar 17 00:46:01 2017 -0700
tree cf22ef6be18bec1b76b3871b59d74deef95bd61a
parent f9d0804daadf3cc22d406eaf6d603a3dda9e0460

reenable health check, disable other interop tests

tools/jenkins/run_interop.sh

diff --git a/tools/jenkins/run_interop.sh b/tools/jenkins/run_interop.sh
index 2a9fc66..18e8b64 100755
--- a/tools/jenkins/run_interop.sh
+++ b/tools/jenkins/run_interop.sh
@@ -36,4 +36,4 @@
 # Enter the gRPC repo root
 cd $(dirname $0)/../..
 
-tools/run_tests/run_interop_tests.py -l all -s all --cloud_to_prod --cloud_to_prod_auth --use_docker --http2_interop --http2_badserver_interop -t -j 12 $@ || true
+tools/run_tests/run_interop_tests.py -l c++ --use_docker --http2_badserver_interop -t -j 12 $@ || true

tools/run_tests/run_interop_tests.py

diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 55e729a..a516472 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -964,7 +964,7 @@
                           manual_cmd_log=server_manual_cmd_log)
     if not args.manual_run:
       job = dockerjob.DockerJob(spec)
-      #job.wait_for_healthy(timeout_seconds=240)
+      job.wait_for_healthy(timeout_seconds=240)
       print(subprocess.check_output(['docker', 'version']))
       server_jobs[lang] = job
       http2_badserver_ports = tuple([