diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-02-05 13:10:24 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-02-05 14:21:56 -0800 |
| commit | 92711bbc1271691e9593ee2fd5a7ad27288baa0a (patch) | |
| tree | 6bf480cde5b37c24119c93ce1d714fc46595b6a4 | |
| parent | 6c857eab57f241741881b8e8696df44506c6a8fc (diff) | |
make git clone optional
| -rwxr-xr-x | tools/jenkins/docker_run.sh | 14 | ||||
| -rw-r--r-- | tools/run_tests/distribtest_targets.py | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/tools/jenkins/docker_run.sh b/tools/jenkins/docker_run.sh index 49553aae2f..6fbae40ac2 100755 --- a/tools/jenkins/docker_run.sh +++ b/tools/jenkins/docker_run.sh @@ -33,16 +33,22 @@ set -e -mkdir -p /var/local/git -git clone --recursive "$EXTERNAL_GIT_ROOT" /var/local/git/grpc +if [ "$RELATIVE_COPY_PATH" == "" ] +then + mkdir -p /var/local/git + git clone --recursive "$EXTERNAL_GIT_ROOT" /var/local/git/grpc +else + mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH" + cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH/*" "/var/local/git/grpc/$RELATIVE_COPY_PATH" +fi if [ -x "$(command -v rvm)" ] then rvm use ruby-2.1 fi -cd /var/local/git/grpc - nvm use 4 || true +cd /var/local/git/grpc + $RUN_COMMAND diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py index e9a80d2cf4..a8c9020585 100644 --- a/tools/run_tests/distribtest_targets.py +++ b/tools/run_tests/distribtest_targets.py @@ -43,7 +43,8 @@ def create_docker_jobspec(name, dockerfile_dir, shell_command, environ={}, 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'} + 'DOCKER_RUN_SCRIPT': 'tools/jenkins/docker_run.sh', + 'RELATIVE_COPY_PATH': 'test/distrib'} jobspec = jobset.JobSpec( cmdline=['tools/jenkins/build_and_run_docker.sh'] + docker_args, environ=docker_env, |