Merge pull request #17941 from grpc/revert-17836-bugfix/jq-installation

Revert "added retry statements to jq installation commands"
pull/17953/head
Jan Tattermusch 6 years ago committed by GitHub
commit 88386078d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      tools/internal_ci/helper_scripts/prepare_build_linux_perf_rc
  2. 8
      tools/internal_ci/linux/grpc_run_tests_matrix.sh

@ -21,13 +21,7 @@ ulimit -c unlimited
# Performance PR testing needs GH API key and PR metadata to comment results # Performance PR testing needs GH API key and PR metadata to comment results
if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ]; then if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ]; then
retry=0 sudo apt-get install -y jq
until [ $retry -ge 3 ]
do
sudo apt-get install -y jq && break
retry=$[$retry+1]
sleep 5
done
export ghprbTargetBranch=$(curl -s https://api.github.com/repos/grpc/grpc/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER | jq -r .base.ref) export ghprbTargetBranch=$(curl -s https://api.github.com/repos/grpc/grpc/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER | jq -r .base.ref)
fi fi

@ -23,13 +23,7 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc
# If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests # If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests
if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ] && [ -n "$RUN_TESTS_FLAGS" ]; then if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ] && [ -n "$RUN_TESTS_FLAGS" ]; then
sudo apt-get update sudo apt-get update
retry=0 sudo apt-get install -y jq
until [ $retry -ge 3 ]
do
sudo apt-get install -y jq && break
retry=$[$retry+1]
sleep 5
done
ghprbTargetBranch=$(curl -s https://api.github.com/repos/grpc/grpc/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER | jq -r .base.ref) 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" export RUN_TESTS_FLAGS="$RUN_TESTS_FLAGS --filter_pr_tests --base_branch origin/$ghprbTargetBranch"
fi fi

Loading…
Cancel
Save