diff options
| author |  Eric Gribkoff <ericgribkoff@google.com> | 2017-03-16 10:27:00 -0700 |
|---|---|---|
| committer | Eric Gribkoff <ericgribkoff@google.com> | 2017-03-17 00:46:01 -0700 |
| commit | 6ce6166bd0451db14893b896384517bb95fbfea3 (patch) | |
| tree | cf22ef6be18bec1b76b3871b59d74deef95bd61a | |
| parent | f9d0804daadf3cc22d406eaf6d603a3dda9e0460 (diff) | |
reenable health check, disable other interop tests
| -rwxr-xr-x | tools/jenkins/run_interop.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_interop_tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/jenkins/run_interop.sh b/tools/jenkins/run_interop.sh index 2a9fc662a9..18e8b64438 100755 --- a/tools/jenkins/run_interop.sh +++ b/tools/jenkins/run_interop.sh @@ -36,4 +36,4 @@ export LANG=en_US.UTF-8 # 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 diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 55e729ace3..a516472759 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -964,7 +964,7 @@ try: 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([ |