diff --git a/tools/internal_ci/linux/grpc_performance_profile_master.sh b/tools/internal_ci/linux/grpc_performance_profile_master.sh index 40bbfe89dc2..fbff17466bb 100755 --- a/tools/internal_ci/linux/grpc_performance_profile_master.sh +++ b/tools/internal_ci/linux/grpc_performance_profile_master.sh @@ -20,7 +20,7 @@ cd $(dirname $0)/../../.. source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc -tools/jenkins/run_performance_profile_hourly.sh || FAILED="true" +tools/internal_ci/linux/run_performance_profile_hourly.sh || FAILED="true" # kill port_server.py to prevent the build from hanging ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 diff --git a/tools/jenkins/run_performance_profile_daily.sh b/tools/internal_ci/linux/run_performance_profile_daily.sh similarity index 98% rename from tools/jenkins/run_performance_profile_daily.sh rename to tools/internal_ci/linux/run_performance_profile_daily.sh index 48d82a9b7f6..45c7a99805c 100755 --- a/tools/jenkins/run_performance_profile_daily.sh +++ b/tools/internal_ci/linux/run_performance_profile_daily.sh @@ -15,7 +15,7 @@ set -ex -cd $(dirname $0)/../.. +cd $(dirname $0)/../../.. # try to use pypy for generating reports # each trace dumps 7-8gig of text to disk, and processing this into a report is diff --git a/tools/jenkins/run_performance_profile_hourly.sh b/tools/internal_ci/linux/run_performance_profile_hourly.sh similarity index 97% rename from tools/jenkins/run_performance_profile_hourly.sh rename to tools/internal_ci/linux/run_performance_profile_hourly.sh index 9eb89571d60..edf85c2e2c1 100755 --- a/tools/jenkins/run_performance_profile_hourly.sh +++ b/tools/internal_ci/linux/run_performance_profile_hourly.sh @@ -15,7 +15,7 @@ set -ex -cd $(dirname $0)/../.. +cd $(dirname $0)/../../.. ./tools/run_tests/start_port_server.py || true diff --git a/tools/jenkins/run_performance_flamegraphs.sh b/tools/jenkins/run_performance_flamegraphs.sh deleted file mode 100755 index 5455fc9dd25..00000000000 --- a/tools/jenkins/run_performance_flamegraphs.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# This script is invoked by Jenkins and runs full performance test suite. -set -ex - -# Enter the gRPC repo root -cd $(dirname $0)/../.. - -# scalability with 32cores c++ benchmarks -tools/run_tests/run_performance_tests.py \ - -l c++ \ - --category scalable \ - --remote_worker_host grpc-performance-server-32core grpc-performance-client-32core grpc-performance-client2-32core \ - --perf_args "record -F 97 --call-graph dwarf" \ - --flame_graph_reports cpp_flamegraphs \ - || EXIT_CODE=1 - -# scalability with 32cores go benchmarks -tools/run_tests/run_performance_tests.py \ - -l go \ - --category scalable \ - --remote_worker_host grpc-performance-server-32core grpc-performance-client-32core grpc-performance-client2-32core \ - --perf_args "record -F 97 -g" \ - --flame_graph_reports go_flamegraphs \ - || EXIT_CODE=1 - -exit $EXIT_CODE -