From 5371d734de17626f813c7c0d27af0e0ca2721cc6 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 25 Jan 2016 21:40:04 -0800
Subject: [PATCH] move jenkins_slave dockerfiles under tools/dockerfile
---
.../grpc_jenkins_slave_x64}/Dockerfile | 0
.../grpc_jenkins_slave_x86}/Dockerfile | 0
tools/run_tests/run_tests.py | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename tools/{jenkins/grpc_jenkins_slave => dockerfile/grpc_jenkins_slave_x64}/Dockerfile (100%)
rename tools/{jenkins/grpc_jenkins_slave_32bits => dockerfile/grpc_jenkins_slave_x86}/Dockerfile (100%)
diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/dockerfile/grpc_jenkins_slave_x64/Dockerfile
similarity index 100%
rename from tools/jenkins/grpc_jenkins_slave/Dockerfile
rename to tools/dockerfile/grpc_jenkins_slave_x64/Dockerfile
diff --git a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile b/tools/dockerfile/grpc_jenkins_slave_x86/Dockerfile
similarity index 100%
rename from tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile
rename to tools/dockerfile/grpc_jenkins_slave_x86/Dockerfile
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 767b801c2a..7482824099 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -576,9 +576,9 @@ def _windows_toolset_option(compiler):
def _get_dockerfile_dir(arch):
"""Returns dockerfile to use"""
if arch == 'default' or arch == 'x64':
- return 'tools/jenkins/grpc_jenkins_slave'
+ return 'tools/dockerfile/grpc_jenkins_slave_x64'
elif arch == 'x86':
- return 'tools/jenkins/grpc_jenkins_slave_32bits'
+ return 'tools/dockerfile/grpc_jenkins_slave_x86'
else:
print 'Architecture %s not supported with current settings.' % arch
sys.exit(1)
--
GitLab