From 598fb573361599329b81de5dbb6f6a80169c18f2 Mon Sep 17 00:00:00 2001 From: Matt Kwong Date: Tue, 9 May 2017 17:03:43 -0700 Subject: Enable IPv6 in Docker for internal CI --- tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh') diff --git a/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh b/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh index 29f7fda74b..1303d4a110 100755 --- a/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh +++ b/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh @@ -33,8 +33,5 @@ set -ex # change to grpc repo root cd $(dirname $0)/../../../.. -git submodule update --init - -# download docker images from dockerhub -export DOCKERHUB_ORGANIZATION=grpctesting +tools/internal_ci/helper_scripts/pre_build_linux.sh tools/run_tests/run_tests_matrix.py -f c++ asan --inner_jobs 16 -j 1 --internal_ci -- cgit v1.2.3 From e44afe7170a1d40b91054f7bfc51c5ce523e5f51 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 11 May 2017 13:02:13 +0200 Subject: source the linux rc file --- .../internal_ci/helper_scripts/pre_build_linux.sh | 40 ---------------------- .../helper_scripts/prepare_build_linux_rc | 39 +++++++++++++++++++++ .../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 +- .../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 +- 14 files changed, 62 insertions(+), 61 deletions(-) delete mode 100755 tools/internal_ci/helper_scripts/pre_build_linux.sh create mode 100644 tools/internal_ci/helper_scripts/prepare_build_linux_rc (limited to 'tools/internal_ci/linux/sanitizer/grpc_cpp_asan.sh') diff --git a/tools/internal_ci/helper_scripts/pre_build_linux.sh b/tools/internal_ci/helper_scripts/pre_build_linux.sh deleted file mode 100755 index 5ce8fe6de3..0000000000 --- a/tools/internal_ci/helper_scripts/pre_build_linux.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# Copyright 2017, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (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 - -# Enable IPv6 in Docker -sudo sed -i s/DOCKER_OPTS=/DOCKER_OPTS=\"--ipv6\"/g /etc/init.d/docker -sudo /etc/init.d/docker restart - -# Download Docker images from DockerHub -export DOCKERHUB_ORGANIZATION=grpctesting - -git submodule update --init diff --git a/tools/internal_ci/helper_scripts/prepare_build_linux_rc b/tools/internal_ci/helper_scripts/prepare_build_linux_rc new file mode 100644 index 0000000000..c8cb5a0c40 --- /dev/null +++ b/tools/internal_ci/helper_scripts/prepare_build_linux_rc @@ -0,0 +1,39 @@ +#!/bin/bash +# Copyright 2017, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Source this rc script to prepare the environment for linux builds + +# Need to increase open files limit for c tests +ulimit -n 32768 + +# Download Docker images from DockerHub +export DOCKERHUB_ORGANIZATION=grpctesting + +git submodule update --init 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 -- cgit v1.2.3