diff options
| author |  Matt Kwong <mattkwong@google.com> | 2017-10-19 15:12:31 -0700 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2017-10-19 15:44:28 -0700 |
| commit | 31738815d72a6d4e71faa8b2124184876b0e5ff9 (patch) | |
| tree | a9eae7aca75ad725dc0afd4567f9f0b167b7c938 /tools/internal_ci/helper_scripts | |
| parent | 4b8e4756426da3056fab06fd358ebc211cb7b8c6 (diff) | |
Fix brew install issue; enable MacOS test filtering
Diffstat (limited to 'tools/internal_ci/helper_scripts')
| -rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_macos_rc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 8f2056096d..bd8c8eb032 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -40,12 +40,12 @@ pip install google-api-python-client --user python export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json # If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests -# TODO(matt-kwong): enable after fixing brew issue -# if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ] && [ -n "$RUN_TESTS_FLAGS" ]; then -# brew install jq -# ghprbTargetBranch=$(curl -s https://api.github.com/repos/grpc/grpc/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER | jq -r .base.ref) -# export RUN_TESTS_FLAGS="$RUN_TESTS_FLAGS --filter_pr_tests --base_branch origin/$ghprbTargetBranch" -# fi +if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ] && [ -n "$RUN_TESTS_FLAGS" ]; then + brew update + brew install jq + ghprbTargetBranch=$(curl -s https://api.github.com/repos/grpc/grpc/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER | jq -r .base.ref) + export RUN_TESTS_FLAGS="$RUN_TESTS_FLAGS --filter_pr_tests --base_branch origin/$ghprbTargetBranch" +fi set +ex # rvm script is very verbose and exits with errorcode source $HOME/.rvm/scripts/rvm |