Run bloat_diff.py in a separate kokoro job (#28892)

* move bloat_diff to a separate kokoro job

* add grpc_bloat_diff PR job
pull/29036/head^2
Jan Tattermusch 3 years ago committed by GitHub
parent f3079bde89
commit f8a909e76f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 28
      tools/internal_ci/linux/grpc_bloat_diff.sh
  2. 26
      tools/internal_ci/linux/grpc_bloat_diff_in_docker.sh
  3. 16
      tools/internal_ci/linux/grpc_microbenchmark_diff.sh
  4. 33
      tools/internal_ci/linux/pull_request/grpc_bloat_diff.cfg
  5. 4
      tools/run_tests/dockerize/docker_propagate_env.list

@ -0,0 +1,28 @@
#!/usr/bin/env bash
# Copyright 2017 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.
set -ex
# Enter the gRPC repo root
cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_linux_rc
export DOCKERFILE_DIR=tools/dockerfile/test/cxx_debian11_x64
export DOCKER_RUN_SCRIPT=tools/internal_ci/linux/grpc_bloat_diff_in_docker.sh
# The check_on_pr.py needs access to the key to post status on github PRs,
# so we mount the keystore dir to the docker container.
export EXTRA_DOCKER_ARGS="-v ${KOKORO_KEYSTORE_DIR}:/kokoro_keystore -e KOKORO_KEYSTORE_DIR=/kokoro_keystore"
exec tools/run_tests/dockerize/build_and_run_docker.sh

@ -0,0 +1,26 @@
#!/usr/bin/env bash
# Copyright 2022 The 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.
set -ex
# Enter the gRPC repo root
cd $(dirname $0)/../../..
# some extra pip packages are needed for the check_on_pr.py script to work
# TODO(jtattermusch): avoid needing to install these pip packages each time
time python3 -m pip install --user -r tools/internal_ci/helper_scripts/requirements.linux_perf.txt
tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/bloat/bloat_diff.py \
-d "origin/$KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH"

@ -12,8 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
#
# This script is invoked by Jenkins and runs a diff on the microbenchmarks # This script is invoked by Kokoro and runs a diff on the microbenchmarks
set -ex set -ex
# List of benchmarks that provide good signal for analyzing performance changes in pull requests # List of benchmarks that provide good signal for analyzing performance changes in pull requests
@ -25,16 +25,6 @@ cd $(dirname $0)/../../..
source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc source tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc
tools/run_tests/start_port_server.py tools/run_tests/start_port_server.py
tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/bloat/bloat_diff.py \
-d "origin/$KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH" || FAILED="true"
tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \ tools/internal_ci/linux/run_if_c_cpp_modified.sh tools/profiling/microbenchmarks/bm_diff/bm_main.py \
-d "origin/$KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH" \ -d "origin/$KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH" \
-b $BENCHMARKS_TO_RUN || FAILED="true" -b $BENCHMARKS_TO_RUN
# kill port_server.py to prevent the build from freezing
ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9
if [ "$FAILED" != "" ]
then
exit 1
fi

@ -0,0 +1,33 @@
# Copyright 2022 The 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.
# Config file for the internal CI (in protobuf text format)
# Location of the continuous shell script in repository.
build_file: "grpc/tools/internal_ci/linux/grpc_bloat_diff.sh"
timeout_mins: 120
before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 73836
keyname: "grpc_checks_private_key"
}
}
}
action {
define_artifacts {
regex: "**/*sponge_log.*"
regex: "github/grpc/reports/**"
}
}

@ -8,9 +8,13 @@ THIS_IS_REALLY_NEEDED="see https://github.com/docker/docker/issues/14203 for why
# Kokoro sets environment variables for each build and we want them to be # Kokoro sets environment variables for each build and we want them to be
# available inside the test docker containers. # available inside the test docker containers.
KOKORO_BUILD_ID KOKORO_BUILD_ID
KOKORO_BUILD_INITIATOR
KOKORO_BUILD_NUMBER KOKORO_BUILD_NUMBER
KOKORO_BUILD_URL KOKORO_BUILD_URL
KOKORO_GIT_COMMIT
KOKORO_JOB_NAME KOKORO_JOB_NAME
KOKORO_GITHUB_PULL_REQUEST_NUMBER
KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH
# Propagate ccache configuration to the docker containers. # Propagate ccache configuration to the docker containers.
GRPC_BUILD_ENABLE_CCACHE GRPC_BUILD_ENABLE_CCACHE

Loading…
Cancel
Save