source the linux rc file

8 years ago · e44afe7170
parent 598fb57336
commit e44afe7170
13 changed files with 26 additions and 25 deletions
--- a/tools/internal_ci/helper_scripts/prepare_build_linux_rc
+++ 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
--- 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 $@

--- 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 $@

--- 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 $@
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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