diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-01-26 14:40:31 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-01-27 13:37:24 -0800 |
| commit | ed342b1c4d9abe15dd9f8f29f38bb3b46fd143c8 (patch) | |
| tree | c0600d1cebe5519d33c85786ba385a0f5c3f5982 /tools/run_tests | |
| parent | 2bb4d3fda259d292b5373bbc71dbe4ffac85895e (diff) | |
meaningful name for grpc_jenkins_slave
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index d3e17c5100..885a79c07b 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -631,9 +631,9 @@ def _get_dockerfile_dir(language, cfg, arch): return custom else: if arch == 'default' or arch == 'x64': - return 'tools/dockerfile/grpc_jenkins_slave_x64' + return 'tools/dockerfile/grpc_tests_multilang_x64' elif arch == 'x86': - return 'tools/dockerfile/grpc_jenkins_slave_x86' + return 'tools/dockerfile/grpc_tests_multilang_x86' else: print 'Architecture %s not supported with current settings.' % arch sys.exit(1) @@ -804,7 +804,7 @@ if args.use_docker: time.sleep(5) child_argv = [ arg for arg in sys.argv if not arg == '--use_docker' ] - run_tests_cmd = 'tools/run_tests/run_tests.py %s' % ' '.join(child_argv[1:]) + run_tests_cmd = 'python tools/run_tests/run_tests.py %s' % ' '.join(child_argv[1:]) env = os.environ.copy() env['RUN_TESTS_COMMAND'] = run_tests_cmd |