From 3ec6b95a95c37ee008e0cfd841270712fff74e0d Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 28 Jan 2016 10:06:11 -0800 Subject: [PATCH 1/2] Measure CPU costs on Jenkins Linux --- tools/jenkins/run_jenkins.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh index 4cb31e601a4..da6ca698095 100755 --- a/tools/jenkins/run_jenkins.sh +++ b/tools/jenkins/run_jenkins.sh @@ -41,7 +41,7 @@ set -ex -o igncr || set -ex if [ "$platform" == "linux" ] then - USE_DOCKER_MAYBE="--use_docker" + PLATFORM_SPECIFIC_ARGS="--use_docker --measure_cpu_costs" elif [ "$platform" == "freebsd" ] then export MAKE=gmake @@ -49,7 +49,14 @@ fi unset platform # variable named 'platform' breaks the windows build -python tools/run_tests/run_tests.py $USE_DOCKER_MAYBE -t -l $language -c $config -x report.xml -j 2 $@ || TESTS_FAILED="true" +python tools/run_tests/run_tests.py \ + $PLATFORM_SPECIFIC_ARGS \ + -t \ + -l $language \ + -c $config \ + -x report.xml \ + -j 2 \ + $@ || TESTS_FAILED="true" if [ ! -e reports/index.html ] then From 3ab10f878bef0720f4d2f0a6c5a5c2390bf6ed89 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 28 Jan 2016 11:16:37 -0800 Subject: [PATCH 2/2] Install "time" so that we can profile things --- tools/dockerfile/grpc_sanity/Dockerfile | 4 ++++ tools/dockerfile/grpc_tests_multilang_x64/Dockerfile | 4 ++++ tools/dockerfile/grpc_tests_multilang_x86/Dockerfile | 3 +++ 3 files changed, 11 insertions(+) diff --git a/tools/dockerfile/grpc_sanity/Dockerfile b/tools/dockerfile/grpc_sanity/Dockerfile index 6f7797d32ab..8833141832a 100644 --- a/tools/dockerfile/grpc_sanity/Dockerfile +++ b/tools/dockerfile/grpc_sanity/Dockerfile @@ -73,6 +73,10 @@ RUN pip install simplejson mako RUN curl https://get.docker.com/ | sh RUN apt-get remove --purge -y docker-engine +################## +# Build profiling +RUN apt-get install -y time + RUN mkdir /var/local/jenkins # Define the default command. diff --git a/tools/dockerfile/grpc_tests_multilang_x64/Dockerfile b/tools/dockerfile/grpc_tests_multilang_x64/Dockerfile index 7785f3d99ae..aa5fc5cf72a 100644 --- a/tools/dockerfile/grpc_tests_multilang_x64/Dockerfile +++ b/tools/dockerfile/grpc_tests_multilang_x64/Dockerfile @@ -153,6 +153,10 @@ RUN apt-get update && apt-get install -y \ # Zookeeper dependencies RUN apt-get install -y libzookeeper-mt-dev +################## +# Build profiling +RUN apt-get install -y time + RUN mkdir /var/local/jenkins # Define the default command. diff --git a/tools/dockerfile/grpc_tests_multilang_x86/Dockerfile b/tools/dockerfile/grpc_tests_multilang_x86/Dockerfile index c5cd45ea088..6e0dbd7d572 100644 --- a/tools/dockerfile/grpc_tests_multilang_x86/Dockerfile +++ b/tools/dockerfile/grpc_tests_multilang_x86/Dockerfile @@ -152,6 +152,9 @@ RUN apt-get update && apt-get install -y \ # Zookeeper dependencies RUN apt-get install -y libzookeeper-mt-dev +################## +# Build profiling +RUN apt-get install -y time RUN mkdir /var/local/jenkins