aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/interop_matrix
diff options
context:
space:
mode:
authorGravatar Yong Ni <yongni@google.com>2017-06-30 16:35:33 -0700
committerGravatar Yong Ni <yongni@google.com>2017-06-30 16:39:26 -0700
commitf303426f72f8e859c75aa5f3a7687629d289e294 (patch)
tree7f81b5f5874bd819979d36795929329f57895c2c /tools/interop_matrix
parentb7ea4ab4d7360fd37d13e91fb0b1dd4ab407dde0 (diff)
Replaced 'docker run' with 'gcloud docker -- run' to take care of docker image downloading.
Diffstat (limited to 'tools/interop_matrix')
-rw-r--r--tools/interop_matrix/README.md1
-rwxr-xr-xtools/interop_matrix/run_interop_matrix_tests.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/interop_matrix/README.md b/tools/interop_matrix/README.md
index 14fe82b9a1..f92dc690e2 100644
--- a/tools/interop_matrix/README.md
+++ b/tools/interop_matrix/README.md
@@ -38,6 +38,7 @@ from specific releases/tag, are used to test version compatiblity between gRPC r
- The output for all the test cases is recorded in a junit style xml file (default to 'report.xml').
## Instructions for running test cases against a GCR image manually
+- Download docker image from GCR. For example: `gcloud docker -- pull gcr.io/grpc-testing/grpc_interop_go1.7:master`.
- Run test cases by specifying `docker_image` variable inline with the test case script created above.
For example:
- `docker_image=gcr.io/grpc-testing/grpc_interop_go1.7:master ./testcases/go__master` will run go__master test cases against `go1.7` with gRPC release `master` docker image in GCR.
diff --git a/tools/interop_matrix/run_interop_matrix_tests.py b/tools/interop_matrix/run_interop_matrix_tests.py
index 3273c3d759..ff3bf8d5e5 100755
--- a/tools/interop_matrix/run_interop_matrix_tests.py
+++ b/tools/interop_matrix/run_interop_matrix_tests.py
@@ -125,6 +125,7 @@ def find_test_cases(lang, release):
# Only line start with 'docker run' are test cases.
for line in f.readlines():
if line.startswith('docker run'):
+ line = line.replace('docker run', 'gcloud docker -- run')
m = re.search('--test_case=(.*)"', line)
shortname = m.group(1) if m else 'unknown_test'
spec = jobset.JobSpec(cmdline=line,