From d14d1033879bbb3e8e757dfb39d78fba6d93e144 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 24 Feb 2016 15:39:55 -0800
Subject: [PATCH] Use env-var for post git step
---
.../tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template | 3 ++-
tools/jenkins/docker_run.sh | 2 --
tools/jenkins/docker_run_tests.sh | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template
index ba8f03862c..49371aaa3b 100644
--- a/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template
@@ -40,7 +40,8 @@
RUN pip install argparse
RUN wget ${openssl_fallback.base_uri + openssl_fallback.tarball}
- ADD post-git-setup.sh /
+
+ ENV POST_GIT_STEP tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh
<%include file="../../run_tests_addons.include" args="skip_zookeeper=True"/>
# Define the default command.
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=$?
--
GitLab