diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-11 16:46:41 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-11 16:46:41 -0700 |
| commit | 93afc4b2993e0545f3451290ff4d7a7bfbba7681 (patch) | |
| tree | 6e939cdfcb1c53b8c98906f68b8f28ab2f1eaa77 | |
| parent | 86803d1deadef18b292b8447d98731e7377ff588 (diff) | |
| parent | 7d5111e26aafc990138da381354503e8e61f077e (diff) | |
Merge pull request #6543 from jtattermusch/benchmarking_fix_go_and_others
Fix Go perftests and a few other fixes.
| -rwxr-xr-x | tools/jenkins/run_performance.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/performance/run_worker_go.sh | 4 | ||||
| -rwxr-xr-x | tools/run_tests/run_performance_tests.py | 11 |
3 files changed, 15 insertions, 2 deletions
diff --git a/tools/jenkins/run_performance.sh b/tools/jenkins/run_performance.sh index 13a332751b..99b920f6a0 100755 --- a/tools/jenkins/run_performance.sh +++ b/tools/jenkins/run_performance.sh @@ -34,4 +34,4 @@ set -ex # Enter the gRPC repo root cd $(dirname $0)/../.. -tools/run_tests/run_performance_tests.py -l c++ node ruby csharp python +tools/run_tests/run_performance_tests.py -l c++ node ruby csharp python --netperf --category smoketest diff --git a/tools/run_tests/performance/run_worker_go.sh b/tools/run_tests/performance/run_worker_go.sh index f7f2ece137..6b1242a419 100755 --- a/tools/run_tests/performance/run_worker_go.sh +++ b/tools/run_tests/performance/run_worker_go.sh @@ -32,4 +32,6 @@ set -ex cd $(dirname $0)/../../.. -../gopath/bin/worker $@ +export GOPATH=$(pwd)/../gopath + +${GOPATH}/bin/worker $@ diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index 674d864539..a7728e7f7d 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -137,6 +137,17 @@ def create_netperf_jobspec(server_host='localhost', client_host=None, cmd = 'NETPERF_SERVER_HOST="%s" ' % server_host if bq_result_table: cmd += 'BQ_RESULT_TABLE="%s" ' % bq_result_table + if client_host: + # If netperf is running remotely, the env variables populated by Jenkins + # won't be available on the client, but we need them for uploading results + # to BigQuery. + jenkins_job_name = os.getenv('JOB_NAME') + if jenkins_job_name: + cmd += 'JOB_NAME="%s" ' % jenkins_job_name + jenkins_build_number = os.getenv('BUILD_NUMBER') + if jenkins_build_number: + cmd += 'BUILD_NUMBER="%s" ' % jenkins_build_number + cmd += 'tools/run_tests/performance/run_netperf.sh' if client_host: user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, client_host) |