diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-24 15:39:55 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-24 15:39:55 -0800 |
| commit | d14d1033879bbb3e8e757dfb39d78fba6d93e144 (patch) | |
| tree | e37531e5870b24866521915638bc00b7ed14fb07 /tools | |
| parent | 06c2b70680f316401b18955e6ed9e0368be0a0b8 (diff) | |
Use env-var for post git step
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/jenkins/docker_run.sh | 2 | ||||
| -rwxr-xr-x | tools/jenkins/docker_run_tests.sh | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/jenkins/docker_run.sh b/tools/jenkins/docker_run.sh index 850249a9a2..df7b6571d7 100755 --- a/tools/jenkins/docker_run.sh +++ b/tools/jenkins/docker_run.sh @@ -42,8 +42,6 @@ else cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH" fi -[ -e /post-git-setup.sh ] && /post-git-setup.sh - if [ -x "$(command -v rvm)" ] then rvm use ruby-2.1 diff --git a/tools/jenkins/docker_run_tests.sh b/tools/jenkins/docker_run_tests.sh index 178f273641..1b93b1d492 100755 --- a/tools/jenkins/docker_run_tests.sh +++ b/tools/jenkins/docker_run_tests.sh @@ -43,10 +43,10 @@ chown $(whoami) $XDG_CACHE_HOME mkdir -p /var/local/git git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc -[ -e /post-git-setup.sh ] && /post-git-setup.sh - mkdir -p reports +$POST_GIT_STEP + exit_code=0 $RUN_TESTS_COMMAND || exit_code=$? |