From bbd348c5e18794b0fee65a752bc101cdde4b247d Mon Sep 17 00:00:00 2001
From: Yong Ni <yongni@google.com>
Date: Tue, 18 Jul 2017 08:38:11 -0700
Subject: [PATCH] Added all previous minor releases of gRPC to the matrix.
Modified the testsuite name format for better display test results in sponge.
---
tools/interop_matrix/client_matrix.py | 26 ++++++++++++++++---
.../run_interop_matrix_tests.py | 2 +-
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
index 4394e32c08..4d1b5f0169 100644
--- a/tools/interop_matrix/client_matrix.py
+++ b/tools/interop_matrix/client_matrix.py
@@ -30,9 +30,27 @@ LANG_RUNTIME_MATRIX = {
}
# Dictionary of releases per language. For each language, we need to provide
-# a tuple of release tag (used as the tag for the GCR image) and also github hash.
+# a release tag pointing to the latest build of the branch.
LANG_RELEASE_MATRIX = {
- 'cxx': ['v1.0.1', 'v1.1.2'],
- 'go': ['v1.0.1-GA', 'v1.3.0'],
- 'java': ['v1.0.3', 'v1.1.2'],
+ 'cxx': [
+ 'v1.0.1',
+ 'v1.1.4',
+ 'v1.2.5',
+ 'v1.3.9',
+ 'v1.4.2',
+ ],
+ 'go': [
+ 'v1.0.5',
+ 'v1.2.1',
+ 'v1.3.0',
+ 'v1.4.2',
+ ],
+ 'java': [
+ 'v1.0.3',
+ 'v1.1.2',
+ 'v1.2.0',
+ 'v1.3.1',
+ 'v1.4.0',
+ 'v1.5.0',
+ ],
}
diff --git a/tools/interop_matrix/run_interop_matrix_tests.py b/tools/interop_matrix/run_interop_matrix_tests.py
index 28126ddf5c..4315c8277d 100755
--- a/tools/interop_matrix/run_interop_matrix_tests.py
+++ b/tools/interop_matrix/run_interop_matrix_tests.py
@@ -168,7 +168,7 @@ def run_tests_for_lang(lang, runtime, images):
_xml_report_tree,
resultset,
'grpc_interop_matrix',
- '%s__%s:%s'%(lang,runtime,release),
+ '%s__%s %s'%(lang,runtime,release),
str(uuid.uuid4()))
_docker_images_cleanup = []
--
GitLab