From 92b5a00beaafed776e7ead6fb2211d3d17e7ce2e Mon Sep 17 00:00:00 2001 From: Adele Zhou Date: Tue, 7 Nov 2017 11:25:49 -0800 Subject: [PATCH 1/3] Remove images as soon as its testing is done instead in the end. --- tools/interop_matrix/run_interop_matrix_tests.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/interop_matrix/run_interop_matrix_tests.py b/tools/interop_matrix/run_interop_matrix_tests.py index 491438a2921..779d3d0b6a3 100755 --- a/tools/interop_matrix/run_interop_matrix_tests.py +++ b/tools/interop_matrix/run_interop_matrix_tests.py @@ -83,6 +83,8 @@ argp.add_argument('--bq_result_table', args = argp.parse_args() +print(str(args)) + def find_all_images_for_lang(lang): """Find docker images for a language across releases and runtimes. @@ -170,7 +172,7 @@ def run_tests_for_lang(lang, runtime, images): jobset.message('START', 'Testing %s' % image, do_newline=True) # Download the docker image before running each test case. subprocess.check_call(['gcloud', 'docker', '--', 'pull', image]) - _docker_images_cleanup.append(image) + #_docker_images_cleanup.append(image) suite_name = '%s__%s_%s' % (lang, runtime, release) job_spec_list = find_test_cases(lang, runtime, release, suite_name) @@ -197,17 +199,17 @@ def run_tests_for_lang(lang, runtime, images): 'grpc_interop_matrix', suite_name, str(uuid.uuid4())) + + if not args.keep: + cleanup(image) return total_num_failures -_docker_images_cleanup = [] -def cleanup(): - if not args.keep: - for image in _docker_images_cleanup: - dockerjob.remove_image(image, skip_nonexistent=True) +def cleanup(image): + jobset.message('START', 'Cleanup docker image %s' % image, do_newline=True) + dockerjob.remove_image(image, skip_nonexistent=True) -atexit.register(cleanup) languages = args.language if args.language != ['all'] else _LANGUAGES total_num_failures = 0 From d21204cd4205635eeb483418de132470c9f67f8e Mon Sep 17 00:00:00 2001 From: Adele Zhou Date: Wed, 8 Nov 2017 11:18:32 -0800 Subject: [PATCH 2/3] Update C# versions --- tools/interop_matrix/client_matrix.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index 51f04ea40b1..b3a500d730d 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -97,11 +97,10 @@ LANG_RELEASE_MATRIX = { 'v1.6.6', ], 'csharp': [ - # Fail to build images due to #13278. #'v1.0.1', - #'v1.1.4', - #'v1.2.5', - #'v1.3.9', + #'v1.1.4', Fail to build. + #'v1.2.5', Fail to run test with csharp image. + 'v1.3.9', 'v1.4.2', 'v1.6.6', ], From fe783c19ffc05aed896fae43f25903cccc3e1fb2 Mon Sep 17 00:00:00 2001 From: Adele Zhou Date: Wed, 8 Nov 2017 11:32:22 -0800 Subject: [PATCH 3/3] Removed Python because of test timeouts --- tools/interop_matrix/client_matrix.py | 16 ++++++++-------- tools/interop_matrix/run_interop_matrix_tests.py | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index b3a500d730d..6bd7ff6406d 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -27,7 +27,7 @@ LANG_RUNTIME_MATRIX = { 'cxx': ['cxx'], # This is actually debian8. 'go': ['go1.7', 'go1.8'], 'java': ['java_oracle8'], - 'python': ['python'], + #'python': ['python'], # All python versions fail the tests due to timeout. 'node': ['node'], 'ruby': ['ruby'], 'php': ['php', 'php7'], @@ -64,14 +64,14 @@ LANG_RELEASE_MATRIX = { 'v1.6.1', 'v1.7.0', ], - 'python': [ + #'python': [ #'v1.0.x', #Fail to run the test. #13230. - 'v1.1.4', - 'v1.2.5', - 'v1.3.9', - 'v1.4.2', - 'v1.6.6', - ], + # 'v1.1.4', + # 'v1.2.5', + # 'v1.3.9', + # 'v1.4.2', + # 'v1.6.6', + #], 'node': [ 'v1.0.1', 'v1.1.4', diff --git a/tools/interop_matrix/run_interop_matrix_tests.py b/tools/interop_matrix/run_interop_matrix_tests.py index 779d3d0b6a3..dce1033add8 100755 --- a/tools/interop_matrix/run_interop_matrix_tests.py +++ b/tools/interop_matrix/run_interop_matrix_tests.py @@ -172,7 +172,6 @@ def run_tests_for_lang(lang, runtime, images): jobset.message('START', 'Testing %s' % image, do_newline=True) # Download the docker image before running each test case. subprocess.check_call(['gcloud', 'docker', '--', 'pull', image]) - #_docker_images_cleanup.append(image) suite_name = '%s__%s_%s' % (lang, runtime, release) job_spec_list = find_test_cases(lang, runtime, release, suite_name)