Skip to content
Snippets Groups Projects
Commit 5371d734 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

move jenkins_slave dockerfiles under tools/dockerfile

parent 1961a80e
Branches
Tags
No related merge requests found
...@@ -576,9 +576,9 @@ def _windows_toolset_option(compiler): ...@@ -576,9 +576,9 @@ def _windows_toolset_option(compiler):
def _get_dockerfile_dir(arch): def _get_dockerfile_dir(arch):
"""Returns dockerfile to use""" """Returns dockerfile to use"""
if arch == 'default' or arch == 'x64': if arch == 'default' or arch == 'x64':
return 'tools/jenkins/grpc_jenkins_slave' return 'tools/dockerfile/grpc_jenkins_slave_x64'
elif arch == 'x86': elif arch == 'x86':
return 'tools/jenkins/grpc_jenkins_slave_32bits' return 'tools/dockerfile/grpc_jenkins_slave_x86'
else: else:
print 'Architecture %s not supported with current settings.' % arch print 'Architecture %s not supported with current settings.' % arch
sys.exit(1) sys.exit(1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment