From f303426f72f8e859c75aa5f3a7687629d289e294 Mon Sep 17 00:00:00 2001
From: Yong Ni <yongni@google.com>
Date: Fri, 30 Jun 2017 16:35:33 -0700
Subject: [PATCH] Replaced 'docker run' with 'gcloud docker -- run' to take
care of docker image downloading.
---
tools/interop_matrix/README.md | 1 +
tools/interop_matrix/run_interop_matrix_tests.py | 1 +
2 files changed, 2 insertions(+)
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,
--
GitLab