Merge pull request #6248 from jtattermusch/cleanup_jenkins_perftests
Cleanup tools/jenkins/run_performance.sh script
diff --git a/tools/gce/linux_performance_worker_init.sh b/tools/gce/linux_performance_worker_init.sh
index c7272b6..478e04e 100755
--- a/tools/gce/linux_performance_worker_init.sh
+++ b/tools/gce/linux_performance_worker_init.sh
@@ -82,9 +82,12 @@
# 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 @@
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 2ad87f1..903a144 100755
--- a/tools/jenkins/run_performance.sh
+++ b/tools/jenkins/run_performance.sh
@@ -34,10 +34,4 @@
# 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