Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #17660 from jtattermusch/interop_matrix_lang_release_cleanup

Browse Source 
interop_matrix: refactor LANG_RELEASE_MATRIX
pull/17684/head
Jan Tattermusch 6 years ago committed by GitHub
parent 8d9190c0dd 5aa166eb2d
commit 54963bb90d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 197 additions and 482 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      tools/interop_matrix/README.md
  2. 654
      tools/interop_matrix/client_matrix.py
  3. 16
      tools/interop_matrix/create_matrix_images.py
  4. 7
      tools/interop_matrix/run_interop_matrix_tests.py

2
tools/interop_matrix/README.md
Unescape View File

@ -1,6 +1,6 @@
# Overview # Overview
This directory contains scripts that facilitate building and running gRPC tests for combinations of language/runtimes (known as matrix). This directory contains scripts that facilitate building and running gRPC interoperability tests for combinations of language/runtimes (known as matrix).
The setup builds gRPC docker images for each language/runtime and upload it to Google Container Registry (GCR). These images, encapsulating gRPC stack The setup builds gRPC docker images for each language/runtime and upload it to Google Container Registry (GCR). These images, encapsulating gRPC stack
from specific releases/tag, are used to test version compatiblity between gRPC release versions. from specific releases/tag, are used to test version compatiblity between gRPC release versions.

654
tools/interop_matrix/client_matrix.py
Unescape View File

@ -15,6 +15,8 @@
# Defines languages, runtimes and releases for backward compatibility testing # Defines languages, runtimes and releases for backward compatibility testing
from collections import OrderedDict
def get_github_repo(lang): def get_github_repo(lang):
return { return {
@ -27,23 +29,16 @@ def get_github_repo(lang):
def get_release_tags(lang): def get_release_tags(lang):
return map(lambda r: get_release_tag_name(r), LANG_RELEASE_MATRIX[lang]) """Returns list of known releases for given language."""
return list(LANG_RELEASE_MATRIX[lang].keys())
def get_release_tag_name(release_info):
assert len(release_info.keys()) == 1
return release_info.keys()[0]
def get_runtimes_for_lang_release(lang, release): def get_runtimes_for_lang_release(lang, release):
"""Get list of valid runtimes for given release of lang.""" """Get list of valid runtimes for given release of lang."""
runtimes_to_skip = [] runtimes_to_skip = []
# see if any the lang release has "skip_runtime" annotation. release_info = LANG_RELEASE_MATRIX[lang][release]
for release_info in LANG_RELEASE_MATRIX[lang]: if release_info:
if get_release_tag_name(release_info) == release: runtimes_to_skip = release_info.skip_runtime
if release_info[release] is not None:
runtimes_to_skip = release_info[release].get('skip_runtime', [])
break
return [ return [
runtime for runtime in LANG_RUNTIME_MATRIX[lang] runtime for runtime in LANG_RUNTIME_MATRIX[lang]
if runtime not in runtimes_to_skip if runtime not in runtimes_to_skip
@ -51,6 +46,9 @@ def get_runtimes_for_lang_release(lang, release):
def should_build_docker_interop_image_from_release_tag(lang): def should_build_docker_interop_image_from_release_tag(lang):
# All dockerfile definitions live in grpc/grpc repository.
# For language that have a separate repo, we need to use
# dockerfile definitions from head of grpc/grpc.
if lang in ['go', 'java', 'node']: if lang in ['go', 'java', 'node']:
return False return False
return True return True
@ -68,465 +66,183 @@ LANG_RUNTIME_MATRIX = {
'csharp': ['csharp', 'csharpcoreclr'], 'csharp': ['csharp', 'csharpcoreclr'],
} }
class ReleaseInfo:
"""Info about a single release of a language"""
def __init__(self, patch=[], skip_runtime=[], testcases_file=None):
self.patch = patch
self.skip_runtime = skip_runtime
self.testcases_file = None
# Dictionary of known releases for given language. # Dictionary of known releases for given language.
LANG_RELEASE_MATRIX = { LANG_RELEASE_MATRIX = {
'cxx': [ 'cxx':
{ OrderedDict([
'v1.0.1': None ('v1.0.1', ReleaseInfo()),
}, ('v1.1.4', ReleaseInfo()),
{ ('v1.2.5', ReleaseInfo()),
'v1.1.4': None ('v1.3.9', ReleaseInfo()),
}, ('v1.4.2', ReleaseInfo()),
{ ('v1.6.6', ReleaseInfo()),
'v1.2.5': None ('v1.7.2', ReleaseInfo()),
}, ('v1.8.0', ReleaseInfo()),
{ ('v1.9.1', ReleaseInfo()),
'v1.3.9': None ('v1.10.1', ReleaseInfo()),
}, ('v1.11.1', ReleaseInfo()),
{ ('v1.12.0', ReleaseInfo()),
'v1.4.2': None ('v1.13.0', ReleaseInfo()),
}, ('v1.14.1', ReleaseInfo()),
{ ('v1.15.0', ReleaseInfo()),
'v1.6.6': None ('v1.16.0', ReleaseInfo()),
}, ('v1.17.1', ReleaseInfo()),
{ ]),
'v1.7.2': None 'go':
}, OrderedDict([
{ ('v1.0.5', ReleaseInfo(skip_runtime=['go1.11'])),
'v1.8.0': None ('v1.2.1', ReleaseInfo(skip_runtime=['go1.11'])),
}, ('v1.3.0', ReleaseInfo(skip_runtime=['go1.11'])),
{ ('v1.4.2', ReleaseInfo(skip_runtime=['go1.11'])),
'v1.9.1': None ('v1.5.2', ReleaseInfo(skip_runtime=['go1.11'])),
}, ('v1.6.0', ReleaseInfo(skip_runtime=['go1.11'])),
{ ('v1.7.4', ReleaseInfo(skip_runtime=['go1.11'])),
'v1.10.1': None ('v1.8.2', ReleaseInfo(skip_runtime=['go1.11'])),
}, ('v1.9.2', ReleaseInfo(skip_runtime=['go1.11'])),
{ ('v1.10.1', ReleaseInfo(skip_runtime=['go1.11'])),
'v1.11.1': None ('v1.11.3', ReleaseInfo(skip_runtime=['go1.11'])),
}, ('v1.12.2', ReleaseInfo(skip_runtime=['go1.11'])),
{ ('v1.13.0', ReleaseInfo(skip_runtime=['go1.11'])),
'v1.12.0': None ('v1.14.0', ReleaseInfo(skip_runtime=['go1.11'])),
}, ('v1.15.0', ReleaseInfo(skip_runtime=['go1.11'])),
{ ('v1.16.0', ReleaseInfo(skip_runtime=['go1.11'])),
'v1.13.0': None ('v1.17.0', ReleaseInfo(skip_runtime=['go1.7', 'go1.8'])),
}, ]),
{ 'java':
'v1.14.1': None OrderedDict([
}, ('v1.0.3', ReleaseInfo()),
{ ('v1.1.2', ReleaseInfo()),
'v1.15.0': None ('v1.2.0', ReleaseInfo()),
}, ('v1.3.1', ReleaseInfo()),
{ ('v1.4.0', ReleaseInfo()),
'v1.16.0': None ('v1.5.0', ReleaseInfo()),
}, ('v1.6.1', ReleaseInfo()),
{ ('v1.7.0', ReleaseInfo()),
'v1.17.1': None ('v1.8.0', ReleaseInfo()),
}, ('v1.9.1', ReleaseInfo()),
], ('v1.10.1', ReleaseInfo()),
'go': [ ('v1.11.0', ReleaseInfo()),
{ ('v1.12.0', ReleaseInfo()),
'v1.0.5': { ('v1.13.1', ReleaseInfo()),
'skip_runtime': ['go1.11'] ('v1.14.0', ReleaseInfo()),
} ('v1.15.0', ReleaseInfo()),
}, ('v1.16.1', ReleaseInfo()),
{ ('v1.17.1', ReleaseInfo()),
'v1.2.1': { ]),
'skip_runtime': ['go1.11'] 'python':
} OrderedDict([
}, ('v1.0.x', ReleaseInfo()),
{ ('v1.1.4', ReleaseInfo()),
'v1.3.0': { ('v1.2.5', ReleaseInfo()),
'skip_runtime': ['go1.11'] ('v1.3.9', ReleaseInfo()),
} ('v1.4.2', ReleaseInfo()),
}, ('v1.6.6', ReleaseInfo()),
{ ('v1.7.2', ReleaseInfo()),
'v1.4.2': { ('v1.8.1', ReleaseInfo()),
'skip_runtime': ['go1.11'] ('v1.9.1', ReleaseInfo()),
} ('v1.10.1', ReleaseInfo()),
}, ('v1.11.1', ReleaseInfo()),
{ ('v1.12.0', ReleaseInfo()),
'v1.5.2': { ('v1.13.0', ReleaseInfo()),
'skip_runtime': ['go1.11'] ('v1.14.1', ReleaseInfo()),
} ('v1.15.0', ReleaseInfo()),
}, ('v1.16.0', ReleaseInfo()),
{ ('v1.17.1', ReleaseInfo()),
'v1.6.0': { ]),
'skip_runtime': ['go1.11'] 'node':
} OrderedDict([
}, ('v1.0.1', ReleaseInfo()),
{ ('v1.1.4', ReleaseInfo()),
'v1.7.4': { ('v1.2.5', ReleaseInfo()),
'skip_runtime': ['go1.11'] ('v1.3.9', ReleaseInfo()),
} ('v1.4.2', ReleaseInfo()),
}, ('v1.6.6', ReleaseInfo()),
{
'v1.8.2': {
'skip_runtime': ['go1.11']
}
},
{
'v1.9.2': {
'skip_runtime': ['go1.11']
}
},
{
'v1.10.1': {
'skip_runtime': ['go1.11']
}
},
{
'v1.11.3': {
'skip_runtime': ['go1.11']
}
},
{
'v1.12.2': {
'skip_runtime': ['go1.11']
}
},
{
'v1.13.0': {
'skip_runtime': ['go1.11']
}
},
{
'v1.14.0': {
'skip_runtime': ['go1.11']
}
},
{
'v1.15.0': {
'skip_runtime': ['go1.11']
}
},
{
'v1.16.0': {
'skip_runtime': ['go1.11']
}
},
{
'v1.17.0': {
'skip_runtime': ['go1.7', 'go1.8']
}
},
],
'java': [
{
'v1.0.3': None
},
{
'v1.1.2': None
},
{
'v1.2.0': None
},
{
'v1.3.1': None
},
{
'v1.4.0': None
},
{
'v1.5.0': None
},
{
'v1.6.1': None
},
{
'v1.7.0': None
},
{
'v1.8.0': None
},
{
'v1.9.1': None
},
{
'v1.10.1': None
},
{
'v1.11.0': None
},
{
'v1.12.0': None
},
{
'v1.13.1': None
},
{
'v1.14.0': None
},
{
'v1.15.0': None
},
{
'v1.16.1': None
},
{
'v1.17.1': None
},
],
'python': [
{
'v1.0.x': None
},
{
'v1.1.4': None
},
{
'v1.2.5': None
},
{
'v1.3.9': None
},
{
'v1.4.2': None
},
{
'v1.6.6': None
},
{
'v1.7.2': None
},
{
'v1.8.1': None # first python 1.8 release is 1.8.1
},
{
'v1.9.1': None
},
{
'v1.10.1': None
},
{
'v1.11.1': None
},
{
'v1.12.0': None
},
{
'v1.13.0': None
},
{
'v1.14.1': None
},
{
'v1.15.0': None
},
{
'v1.16.0': None
},
{
'v1.17.1': None
},
],
'node': [
{
'v1.0.1': None
},
{
'v1.1.4': None
},
{
'v1.2.5': None
},
{
'v1.3.9': None
},
{
'v1.4.2': None
},
{
'v1.6.6': None
},
# TODO: https://github.com/grpc/grpc-node/issues/235. # TODO: https://github.com/grpc/grpc-node/issues/235.
#{ # ('v1.7.2', ReleaseInfo()),
# 'v1.7.2': None ('v1.8.4', ReleaseInfo()),
#}, ('v1.9.1', ReleaseInfo()),
{ ('v1.10.0', ReleaseInfo()),
'v1.8.4': None ('v1.11.3', ReleaseInfo()),
}, ('v1.12.4', ReleaseInfo()),
{ ]),
'v1.9.1': None 'ruby':
}, OrderedDict([
{ ('v1.0.1',
'v1.10.0': None ReleaseInfo(patch=[
}, 'tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile',
{ 'tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh',
'v1.11.3': None ])),
}, ('v1.1.4', ReleaseInfo()),
{ ('v1.2.5', ReleaseInfo()),
'v1.12.4': None ('v1.3.9', ReleaseInfo()),
}, ('v1.4.2', ReleaseInfo()),
], ('v1.6.6', ReleaseInfo()),
'ruby': [ ('v1.7.2', ReleaseInfo()),
{ ('v1.8.0', ReleaseInfo()),
'v1.0.1': { ('v1.9.1', ReleaseInfo()),
'patch': [ ('v1.10.1', ReleaseInfo()),
'tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile', ('v1.11.1', ReleaseInfo()),
'tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh', ('v1.12.0', ReleaseInfo()),
] ('v1.13.0', ReleaseInfo()),
} ('v1.14.1', ReleaseInfo()),
}, ('v1.15.0', ReleaseInfo()),
{ ('v1.16.0', ReleaseInfo()),
'v1.1.4': None ('v1.17.1', ReleaseInfo()),
}, ]),
{ 'php':
'v1.2.5': None OrderedDict([
}, ('v1.0.1', ReleaseInfo()),
{ ('v1.1.4', ReleaseInfo()),
'v1.3.9': None ('v1.2.5', ReleaseInfo()),
}, ('v1.3.9', ReleaseInfo()),
{ ('v1.4.2', ReleaseInfo()),
'v1.4.2': None ('v1.6.6', ReleaseInfo()),
}, ('v1.7.2', ReleaseInfo()),
{ ('v1.8.0', ReleaseInfo()),
'v1.6.6': None ('v1.9.1', ReleaseInfo()),
}, ('v1.10.1', ReleaseInfo()),
{ ('v1.11.1', ReleaseInfo()),
'v1.7.2': None ('v1.12.0', ReleaseInfo()),
}, ('v1.13.0', ReleaseInfo()),
{ ('v1.14.1', ReleaseInfo()),
'v1.8.0': None ('v1.15.0', ReleaseInfo()),
}, ('v1.16.0', ReleaseInfo()),
{ ('v1.17.1', ReleaseInfo()),
'v1.9.1': None ]),
}, 'csharp':
{ OrderedDict([
'v1.10.1': None ('v1.0.1',
}, ReleaseInfo(patch=[
{ 'tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile',
'v1.11.1': None 'tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile',
}, ])),
{ ('v1.1.4', ReleaseInfo()),
'v1.12.0': None ('v1.2.5', ReleaseInfo()),
}, ('v1.3.9', ReleaseInfo()),
{ ('v1.4.2', ReleaseInfo()),
'v1.13.0': None ('v1.6.6', ReleaseInfo()),
}, ('v1.7.2', ReleaseInfo()),
{ ('v1.8.0', ReleaseInfo()),
'v1.14.1': None ('v1.9.1', ReleaseInfo()),
}, ('v1.10.1', ReleaseInfo()),
{ ('v1.11.1', ReleaseInfo()),
'v1.15.0': None ('v1.12.0', ReleaseInfo()),
}, ('v1.13.0', ReleaseInfo()),
{ ('v1.14.1', ReleaseInfo()),
'v1.16.0': None ('v1.15.0', ReleaseInfo()),
}, ('v1.16.0', ReleaseInfo()),
{ ('v1.17.1', ReleaseInfo()),
'v1.17.1': None ]),
},
],
'php': [
{
'v1.0.1': None
},
{
'v1.1.4': None
},
{
'v1.2.5': None
},
{
'v1.3.9': None
},
{
'v1.4.2': None
},
{
'v1.6.6': None
},
{
'v1.7.2': None
},
{
'v1.8.0': None
},
{
'v1.9.1': None
},
{
'v1.10.1': None
},
{
'v1.11.1': None
},
{
'v1.12.0': None
},
{
'v1.13.0': None
},
{
'v1.14.1': None
},
{
'v1.15.0': None
},
{
'v1.16.0': None
},
{
'v1.17.1': None
},
],
'csharp': [
{
'v1.0.1': {
'patch': [
'tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile',
'tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile',
]
}
},
{
'v1.1.4': None
},
{
'v1.2.5': None
},
{
'v1.3.9': None
},
{
'v1.4.2': None
},
{
'v1.6.6': None
},
{
'v1.7.2': None
},
{
'v1.8.0': None
},
{
'v1.9.1': None
},
{
'v1.10.1': None
},
{
'v1.11.1': None
},
{
'v1.12.0': None
},
{
'v1.13.0': None
},
{
'v1.14.1': None
},
{
'v1.15.0': None
},
{
'v1.16.0': None
},
{
'v1.17.1': None
},
],
} }
# This matrix lists the version of testcases to use for a release. As new # This matrix lists the version of testcases to use for a release. As new
@ -535,6 +251,8 @@ LANG_RELEASE_MATRIX = {
# particular version in some cases. If not specified, xxx__master file will be # particular version in some cases. If not specified, xxx__master file will be
# used. For example, all java versions will run the commands in java__master. # used. For example, all java versions will run the commands in java__master.
# The testcases files exist under the testcases directory. # The testcases files exist under the testcases directory.
# TODO(jtattermusch): make this data part of LANG_RELEASE_MATRIX,
# there is no reason for this to be a separate data structure.
TESTCASES_VERSION_MATRIX = { TESTCASES_VERSION_MATRIX = {
'node_v1.0.1': 'node__v1.0.1', 'node_v1.0.1': 'node__v1.0.1',
'node_v1.1.4': 'node__v1.1.4', 'node_v1.1.4': 'node__v1.1.4',

16
tools/interop_matrix/create_matrix_images.py
Unescape View File

@ -39,10 +39,9 @@ _LANGUAGES = client_matrix.LANG_RUNTIME_MATRIX.keys()
# All gRPC release tags, flattened, deduped and sorted. # All gRPC release tags, flattened, deduped and sorted.
_RELEASES = sorted( _RELEASES = sorted(
list( list(
set( set(release
client_matrix.get_release_tag_name(info) for release_dict in client_matrix.LANG_RELEASE_MATRIX.values()
for lang in client_matrix.LANG_RELEASE_MATRIX.values() for release in release_dict.keys())))
for info in lang)))
# Destination directory inside docker image to keep extra info from build time. # Destination directory inside docker image to keep extra info from build time.
_BUILD_INFO = '/var/local/build_info' _BUILD_INFO = '/var/local/build_info'
@ -260,11 +259,10 @@ atexit.register(cleanup)
def maybe_apply_patches_on_git_tag(stack_base, lang, release): def maybe_apply_patches_on_git_tag(stack_base, lang, release):
files_to_patch = [] files_to_patch = []
for release_info in client_matrix.LANG_RELEASE_MATRIX[lang]:
if client_matrix.get_release_tag_name(release_info) == release: release_info = client_matrix.LANG_RELEASE_MATRIX[lang][release]
if release_info[release] is not None: if release_info:
files_to_patch = release_info[release].get('patch') files_to_patch = release_info.patch
break
if not files_to_patch: if not files_to_patch:
return return
patch_file_relative_path = 'patches/%s_%s/git_repo.patch' % (lang, release) patch_file_relative_path = 'patches/%s_%s/git_repo.patch' % (lang, release)

7
tools/interop_matrix/run_interop_matrix_tests.py
Unescape View File

@ -44,10 +44,9 @@ _LANGUAGES = client_matrix.LANG_RUNTIME_MATRIX.keys()
# All gRPC release tags, flattened, deduped and sorted. # All gRPC release tags, flattened, deduped and sorted.
_RELEASES = sorted( _RELEASES = sorted(
list( list(
set( set(release
client_matrix.get_release_tag_name(info) for release_dict in client_matrix.LANG_RELEASE_MATRIX.values()
for lang in client_matrix.LANG_RELEASE_MATRIX.values() for release in release_dict.keys())))
for info in lang)))
argp = argparse.ArgumentParser(description='Run interop tests.') argp = argparse.ArgumentParser(description='Run interop tests.')
argp.add_argument('-j', '--jobs', default=multiprocessing.cpu_count(), type=int) argp.add_argument('-j', '--jobs', default=multiprocessing.cpu_count(), type=int)

Write Preview
Loading…
Cancel
Save