aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-05 13:53:47 -0800
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-02-05 14:48:10 -0800
commitb5f7397b08de46e5241f7bcf74a4662917a42c0d (patch)
tree9ceffc9b40af9d5e5162fdbcbafef36e8590fa36 /tools/run_tests
parent92711bbc1271691e9593ee2fd5a7ad27288baa0a (diff)
cleanup distribtest Dockerimages
Diffstat (limited to 'tools/run_tests')
-rw-r--r--tools/run_tests/distribtest_targets.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py
index a8c9020585..a1e45ece9d 100644
--- a/tools/run_tests/distribtest_targets.py
+++ b/tools/run_tests/distribtest_targets.py
@@ -38,13 +38,13 @@ def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={},
"""Creates jobspec for a task running under docker."""
environ = environ.copy()
environ['RUN_COMMAND'] = shell_command
+ environ['RELATIVE_COPY_PATH'] = 'test/distrib'
docker_args=[]
for k,v in environ.iteritems():
docker_args += ['-e', '%s=%s' % (k, v)]
docker_env = {'DOCKERFILE_DIR': dockerfile_dir,
- 'DOCKER_RUN_SCRIPT': 'tools/jenkins/docker_run.sh',
- 'RELATIVE_COPY_PATH': 'test/distrib'}
+ 'DOCKER_RUN_SCRIPT': 'tools/jenkins/docker_run.sh'}
jobspec = jobset.JobSpec(
cmdline=['tools/jenkins/build_and_run_docker.sh'] + docker_args,
environ=docker_env,