diff options
author | Muxi Yan <mxyan@google.com> | 2017-07-26 17:02:31 -0700 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2017-07-26 17:02:31 -0700 |
commit | 06038954232cfe5facb69764ac73b204c97bfc08 (patch) | |
tree | fe5e8e8103d4cbe49cf212ebb4fa3fc66406f8b8 /tools/jenkins | |
parent | df174ccd697d4ccdc537da14177f85cbdddaeb76 (diff) | |
parent | ddc0d374886f3db33db90c6c1be163214cc5147d (diff) |
Merge remote-tracking branch 'upstream/master' into stream_compression_config
Diffstat (limited to 'tools/jenkins')
-rwxr-xr-x | tools/jenkins/run_bazel_full.sh | 2 | ||||
-rwxr-xr-x | tools/jenkins/run_qps_diff.sh | 4 | ||||
-rwxr-xr-x | tools/jenkins/run_trickle_diff.sh | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/tools/jenkins/run_bazel_full.sh b/tools/jenkins/run_bazel_full.sh index edde1bc545..3436a8f8b6 100755 --- a/tools/jenkins/run_bazel_full.sh +++ b/tools/jenkins/run_bazel_full.sh @@ -20,6 +20,4 @@ set -ex -o igncr || set -ex export DOCKERFILE_DIR=tools/dockerfile/test/bazel export DOCKER_RUN_SCRIPT=tools/jenkins/run_bazel_full_in_docker.sh -# Warn PR author if they make a change to the bazel directory -tools/run_tests/python_utils/check_bazel_dir.py exec tools/run_tests/dockerize/build_and_run_docker.sh diff --git a/tools/jenkins/run_qps_diff.sh b/tools/jenkins/run_qps_diff.sh index 9529b0126f..51c1341b8b 100755 --- a/tools/jenkins/run_qps_diff.sh +++ b/tools/jenkins/run_qps_diff.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 2015 gRPC authors. +# 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. @@ -20,4 +20,4 @@ set -ex cd $(dirname $0)/../.. tools/run_tests/start_port_server.py -tools/profiling/qps/qps_diff.py -d origin/$ghprbTargetBranch +tools/profiling/qps/qps_diff.py -d origin/$ghprbTargetBranch diff --git a/tools/jenkins/run_trickle_diff.sh b/tools/jenkins/run_trickle_diff.sh index 47dd8b44d6..74f656e5dd 100755 --- a/tools/jenkins/run_trickle_diff.sh +++ b/tools/jenkins/run_trickle_diff.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 2015 gRPC authors. +# 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. |