Skip to content

Commit 1acde46

Browse files
authored
buildscripts: checkout matching grpc/grpc branch for xds test (#6828)
1 parent b72477e commit 1acde46

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

buildscripts/kokoro/xds.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@ fi
88
cd github
99

1010
pushd grpc-java/interop-testing
11+
branch=$(git branch --all --no-color --contains "${KOKORO_GITHUB_COMMIT}" \
12+
| grep -v HEAD | head -1)
13+
shopt -s extglob
14+
branch="${branch//[[:space:]]}"
15+
branch="${branch##remotes/origin/}"
16+
shopt -u extglob
1117
../gradlew installDist -x test -PskipCodegen=true -PskipAndroid=true
1218
popd
1319

14-
git clone https://github.com/grpc/grpc.git
20+
git clone -b "${branch}" https://github.com/grpc/grpc.git
1521

1622
grpc/tools/run_tests/helper_scripts/prep_xds.sh
1723
JAVA_OPTS=-Djava.util.logging.config.file=grpc-java/buildscripts/xds_logging.properties \

0 commit comments

Comments
 (0)