diff options
| author |  Carl Mastrangelo <notcarl@google.com> | 2015-11-06 14:31:55 -0800 |
|---|---|---|
| committer | Carl Mastrangelo <notcarl@google.com> | 2015-11-06 14:31:55 -0800 |
| commit | 3b2e1bd243395c7b471bda2dc4fbdfb8248fe96d (patch) | |
| tree | 969cedbdd079f516289fff39acf78595e8fdb0ce /tools | |
| parent | c8bd16b7e14f81c7c6e8be7817ed86b53c4c2cc9 (diff) | |
Enable interop tests for http2
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/jenkins/run_interop.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_interop_tests.py | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/jenkins/run_interop.sh b/tools/jenkins/run_interop.sh index 5dd477ed77..a424aea7fc 100755 --- a/tools/jenkins/run_interop.sh +++ b/tools/jenkins/run_interop.sh @@ -34,4 +34,4 @@ set -ex # 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 -t -j 12 $@ || true +tools/run_tests/run_interop_tests.py -l all -s all --cloud_to_prod --cloud_to_prod_auth --use_docker --http2_interop -t -j 12 $@ || true diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 1686942b0a..2634164a21 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -624,7 +624,9 @@ try: docker_image=docker_images.get(str(language))) jobs.append(test_job) - if args.http2_interop: + # TODO(carl-mastrangelo): Currently prod TLS terminators aren't spec compliant. Reenable + # this once a better solution is in place. + if args.http2_interop and False: for test_case in _HTTP2_TEST_CASES: test_job = cloud_to_prod_jobspec(http2Interop, test_case, docker_image=docker_images.get(str(http2Interop))) @@ -660,6 +662,9 @@ try: if args.http2_interop: for test_case in _HTTP2_TEST_CASES: + if server_name == "go": + # TODO(carl-mastrangelo): Reenable after https://github.com/grpc/grpc-go/issues/434 + continue test_job = cloud_to_cloud_jobspec(http2Interop, test_case, server_name, |