diff --git a/buildscripts/kokoro/xds.sh b/buildscripts/kokoro/xds.sh index 41ca5bbe7a..82b82c0f2f 100755 --- a/buildscripts/kokoro/xds.sh +++ b/buildscripts/kokoro/xds.sh @@ -8,10 +8,16 @@ fi cd github pushd grpc-java/interop-testing +branch=$(git branch --all --no-color --contains "${KOKORO_GITHUB_COMMIT}" \ + | grep -v HEAD | head -1) +shopt -s extglob +branch="${branch//[[:space:]]}" +branch="${branch##remotes/origin/}" +shopt -u extglob ../gradlew installDist -x test -PskipCodegen=true -PskipAndroid=true popd -git clone https://github.com/grpc/grpc.git +git clone -b "${branch}" https://github.com/grpc/grpc.git grpc/tools/run_tests/helper_scripts/prep_xds.sh JAVA_OPTS=-Djava.util.logging.config.file=grpc-java/buildscripts/xds_logging.properties \