From e44afe7170a1d40b91054f7bfc51c5ce523e5f51 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 11 May 2017 13:02:13 +0200
Subject: [PATCH] source the linux rc file
---
.../{pre_build_linux.sh => prepare_build_linux_rc} | 7 +++----
.../internal_ci/linux/grpc_interop_badserver_java.sh | 3 ++-
.../linux/grpc_interop_badserver_python.sh | 3 ++-
tools/internal_ci/linux/grpc_interop_tocloud.sh | 3 ++-
tools/internal_ci/linux/grpc_master.sh | 11 +----------
tools/internal_ci/linux/grpc_portability.sh | 3 ++-
.../internal_ci/linux/grpc_portability_build_only.sh | 3 ++-
tools/internal_ci/linux/grpc_sanity.sh | 3 ++-
tools/internal_ci/linux/sanitizer/grpc_c_asan.sh | 3 ++-
tools/internal_ci/linux/sanitizer/grpc_c_msan.sh | 3 ++-
tools/internal_ci/linux/sanitizer/grpc_c_tsan.sh | 3 ++-
tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh | 3 ++-
tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.sh | 3 ++-
13 files changed, 26 insertions(+), 25 deletions(-)
rename tools/internal_ci/helper_scripts/{pre_build_linux.sh => prepare_build_linux_rc} (92%)
mode change 100755 => 100644
diff --git a/tools/internal_ci/helper_scripts/pre_build_linux.sh b/tools/internal_ci/helper_scripts/prepare_build_linux_rc
old mode 100755
new mode 100644
similarity index 92%
rename from tools/internal_ci/helper_scripts/pre_build_linux.sh
rename to tools/internal_ci/helper_scripts/prepare_build_linux_rc
index 5ce8fe6de3..c8cb5a0c40
--- a/tools/internal_ci/helper_scripts/pre_build_linux.sh
+++ b/tools/internal_ci/helper_scripts/prepare_build_linux_rc
@@ -28,11 +28,10 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-set -ex
+# Source this rc script to prepare the environment for linux builds
-# Enable IPv6 in Docker
-sudo sed -i s/DOCKER_OPTS=/DOCKER_OPTS=\"--ipv6\"/g /etc/init.d/docker
-sudo /etc/init.d/docker restart
+# Need to increase open files limit for c tests
+ulimit -n 32768
# Download Docker images from DockerHub
export DOCKERHUB_ORGANIZATION=grpctesting
diff --git a/tools/internal_ci/linux/grpc_interop_badserver_java.sh b/tools/internal_ci/linux/grpc_interop_badserver_java.sh
index e85949bbff..02d7b9d431 100755
--- a/tools/internal_ci/linux/grpc_interop_badserver_java.sh
+++ b/tools/internal_ci/linux/grpc_interop_badserver_java.sh
@@ -35,6 +35,7 @@ export LANG=en_US.UTF-8
# Enter the gRPC repo root
cd $(dirname $0)/../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_interop_tests.py -l java --use_docker --http2_server_interop $@
diff --git a/tools/internal_ci/linux/grpc_interop_badserver_python.sh b/tools/internal_ci/linux/grpc_interop_badserver_python.sh
index 2010597d91..3ceb181d90 100755
--- a/tools/internal_ci/linux/grpc_interop_badserver_python.sh
+++ b/tools/internal_ci/linux/grpc_interop_badserver_python.sh
@@ -35,6 +35,7 @@ export LANG=en_US.UTF-8
# Enter the gRPC repo root
cd $(dirname $0)/../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_interop_tests.py -l python --use_docker --http2_server_interop $@
diff --git a/tools/internal_ci/linux/grpc_interop_tocloud.sh b/tools/internal_ci/linux/grpc_interop_tocloud.sh
index 5f3c603a13..a3067e70e6 100755
--- a/tools/internal_ci/linux/grpc_interop_tocloud.sh
+++ b/tools/internal_ci/linux/grpc_interop_tocloud.sh
@@ -35,5 +35,6 @@ export LANG=en_US.UTF-8
# Enter the gRPC repo root
cd $(dirname $0)/../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_interop_tests.py -l all -s all --use_docker --http2_interop -t -j 12 $@
diff --git a/tools/internal_ci/linux/grpc_master.sh b/tools/internal_ci/linux/grpc_master.sh
index b7184c3d7d..d3c89bfa07 100755
--- a/tools/internal_ci/linux/grpc_master.sh
+++ b/tools/internal_ci/linux/grpc_master.sh
@@ -33,15 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
-# TODO(jtattermusch): get rid of the system inspection eventually
-nproc || true
-lsb_release -dc || true
-gcc --version || true
-clang --version || true
-docker --version || true
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
-# Need to increase open files limit for c tests
-ulimit -n 32768
-
-tools/internal_ci/helper_scripts/pre_build_linux.sh
tools/run_tests/run_tests_matrix.py -f basictests linux --inner_jobs 16 -j 1 --internal_ci
diff --git a/tools/internal_ci/linux/grpc_portability.sh b/tools/internal_ci/linux/grpc_portability.sh
index bc7e8ca357..64959c793f 100755
--- a/tools/internal_ci/linux/grpc_portability.sh
+++ b/tools/internal_ci/linux/grpc_portability.sh
@@ -33,5 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_tests_matrix.py -f portability linux --inner_jobs 16 -j 1 --internal_ci
diff --git a/tools/internal_ci/linux/grpc_portability_build_only.sh b/tools/internal_ci/linux/grpc_portability_build_only.sh
index fda511ea67..099c3f8948 100755
--- a/tools/internal_ci/linux/grpc_portability_build_only.sh
+++ b/tools/internal_ci/linux/grpc_portability_build_only.sh
@@ -33,5 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_tests_matrix.py -f portability linux --internal_ci --build_only
diff --git a/tools/internal_ci/linux/grpc_sanity.sh b/tools/internal_ci/linux/grpc_sanity.sh
index 2c6712a893..7166ce7d24 100755
--- a/tools/internal_ci/linux/grpc_sanity.sh
+++ b/tools/internal_ci/linux/grpc_sanity.sh
@@ -33,5 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_tests.py -l sanity -c opt -t -x sponge_log.xml --use_docker --report_suite_name sanity_linux_opt
diff --git a/tools/internal_ci/linux/sanitizer/grpc_c_asan.sh b/tools/internal_ci/linux/sanitizer/grpc_c_asan.sh
index be5ad1c1ae..5a61d9d5d1 100755
--- a/tools/internal_ci/linux/sanitizer/grpc_c_asan.sh
+++ b/tools/internal_ci/linux/sanitizer/grpc_c_asan.sh
@@ -33,5 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_tests_matrix.py -f c asan --inner_jobs 16 -j 1 --internal_ci
diff --git a/tools/internal_ci/linux/sanitizer/grpc_c_msan.sh b/tools/internal_ci/linux/sanitizer/grpc_c_msan.sh
index 299f7739fe..1c3b90dce2 100755
--- a/tools/internal_ci/linux/sanitizer/grpc_c_msan.sh
+++ b/tools/internal_ci/linux/sanitizer/grpc_c_msan.sh
@@ -33,5 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_tests_matrix.py -f c msan --inner_jobs 16 -j 1 --internal_ci
diff --git a/tools/internal_ci/linux/sanitizer/grpc_c_tsan.sh b/tools/internal_ci/linux/sanitizer/grpc_c_tsan.sh
index 6429d07a63..495a004c9d 100755
--- a/tools/internal_ci/linux/sanitizer/grpc_c_tsan.sh
+++ b/tools/internal_ci/linux/sanitizer/grpc_c_tsan.sh
@@ -33,5 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_tests_matrix.py -f c tsan --inner_jobs 16 -j 1 --internal_ci
diff --git a/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh b/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh
index 1303d4a110..99219e3515 100755
--- a/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh
+++ b/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh
@@ -33,5 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_tests_matrix.py -f c++ asan --inner_jobs 16 -j 1 --internal_ci
diff --git a/tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.sh b/tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.sh
index 972e33f542..be46af902c 100755
--- a/tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.sh
+++ b/tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.sh
@@ -33,5 +33,6 @@ set -ex
# change to grpc repo root
cd $(dirname $0)/../../../..
-tools/internal_ci/helper_scripts/pre_build_linux.sh
+source tools/internal_ci/helper_scripts/prepare_build_linux_rc
+
tools/run_tests/run_tests_matrix.py -f c++ tsan --inner_jobs 16 -j 1 --internal_ci
--
GitLab