Merge pull request #4942 from ctiller/measure_some_things

Measure CPU costs on Jenkins Linux

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.

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.

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
 

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