cleanup in run_c_cpp_test.sh

pull/15424/head
Jan Tattermusch 7 years ago
parent 4476d53370
commit c091046b10
  1. 4
      tools/internal_ci/linux/grpc_microbenchmark_diff.sh
  2. 2
      tools/internal_ci/linux/grpc_trickle_diff.sh
  3. 6
      tools/internal_ci/linux/run_if_c_cpp_modified.sh

@ -25,9 +25,9 @@ cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc
tools/run_tests/start_port_server.py tools/run_tests/start_port_server.py
tools/jenkins/run_c_cpp_test.sh tools/profiling/bloat/bloat_diff.py \ tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/bloat/bloat_diff.py \
-d origin/$ghprbTargetBranch || FAILED="true" -d origin/$ghprbTargetBranch || FAILED="true"
tools/jenkins/run_c_cpp_test.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \ tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \
-d origin/$ghprbTargetBranch \ -d origin/$ghprbTargetBranch \
-b $BENCHMARKS_TO_RUN || FAILED="true" -b $BENCHMARKS_TO_RUN || FAILED="true"

@ -25,7 +25,7 @@ cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc
tools/run_tests/start_port_server.py tools/run_tests/start_port_server.py
tools/jenkins/run_c_cpp_test.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \ tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \
-d origin/$ghprbTargetBranch \ -d origin/$ghprbTargetBranch \
-b bm_fullstack_trickle \ -b bm_fullstack_trickle \
-l 4 \ -l 4 \

@ -13,13 +13,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# This script is invoked by a Jenkins pull request job and executes all # This script is invoked by a pull request job and executes all
# args passed to this script if the pull request affect C/C++ code # args passed to this script if the pull request affect C/C++ code
set -ex set -ex
# Enter the gRPC repo root # Enter the gRPC repo root
cd $(dirname $0)/../.. cd $(dirname $0)/../../..
# TODO(jtattermusch): the "ghprbTargetBranch" is Jenkins specific and probably
# does not work on kokoro?
AFFECTS_C_CPP=`python -c 'import os; \ AFFECTS_C_CPP=`python -c 'import os; \
import sys; \ import sys; \
sys.path.insert(0, "tools/run_tests/python_utils"); \ sys.path.insert(0, "tools/run_tests/python_utils"); \
Loading…
Cancel
Save