aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-04-21 12:55:32 -0700
committerGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-04-21 12:55:32 -0700
commit5a56891eb6b1591e97d36072ac067d762aecf07e (patch)
treeb358bcae8acf7b7e2da8580b82864ab058e82308 /tools
parente368d8f5fda01ec5898a4dd9503acea77c8909a8 (diff)
parent962c38787ce4d8c3bb373ff032ebbf0deae429af (diff)
Merge pull request #6248 from jtattermusch/cleanup_jenkins_perftests
Cleanup tools/jenkins/run_performance.sh script
Diffstat (limited to 'tools')
-rwxr-xr-xtools/gce/linux_performance_worker_init.sh7
-rwxr-xr-xtools/jenkins/run_performance.sh8
2 files changed, 8 insertions, 7 deletions
diff --git a/tools/gce/linux_performance_worker_init.sh b/tools/gce/linux_performance_worker_init.sh
index c7272b61a5..478e04ef37 100755
--- a/tools/gce/linux_performance_worker_init.sh
+++ b/tools/gce/linux_performance_worker_init.sh
@@ -82,9 +82,12 @@ sudo apt-get install -y libgflags-dev libgtest-dev libc++-dev clang
# Python dependencies
sudo pip install tabulate
+sudo pip install google-api-python-client
+
curl -O https://bootstrap.pypa.io/get-pip.py
sudo pypy get-pip.py
sudo pypy -m pip install tabulate
+sudo pip install google-api-python-client
# Node dependencies (nvm has to be installed under user jenkins)
touch .profile
@@ -102,4 +105,8 @@ sudo apt-get install -y mono-devel nuget
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
curl -sSL https://get.rvm.io | bash -s stable --ruby
+# Install bundler (prerequisite for gRPC Ruby)
+source ~/.rvm/scripts/rvm
+gem install bundler
+
# Java dependencies - nothing as we already have Java JDK 8
diff --git a/tools/jenkins/run_performance.sh b/tools/jenkins/run_performance.sh
index 2ad87f16a5..903a144215 100755
--- a/tools/jenkins/run_performance.sh
+++ b/tools/jenkins/run_performance.sh
@@ -34,10 +34,4 @@ set -ex
# Enter the gRPC repo root
cd $(dirname $0)/../..
-[[ $* =~ '--latency_profile' ]] \
- && tools/profiling/latency_profile/run_latency_profile.sh \
- || true
-
-tools/run_tests/run_performance_tests.py -l c++
-
-wait
+tools/run_tests/run_performance_tests.py -l c++ node ruby csharp