grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buildscripts: Clean up dummy default version check cmd 

These statements can be simplified to be more readable.
This commit is contained in:
Spencer Fang 2018-08-16 13:43:49 -07:00 committed by zpencer
parent 9aa53b589d
commit 19f4491ce9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildscripts/kokoro/gae-interop.sh
View File

@ -26,16 +26,12 @@ cd ./github/grpc-java
## Deploy the dummy 'default' version of the service ## Deploy the dummy 'default' version of the service
## ##
GRADLE_FLAGS="--stacktrace -DgaeStopPreviousVersion=false -PskipCodegen=true" GRADLE_FLAGS="--stacktrace -DgaeStopPreviousVersion=false -PskipCodegen=true"
DUMMY_EXISTS_CMD="gcloud app versions describe $DUMMY_DEFAULT_VERSION --service=$KOKORO_GAE_SERVICE"
DEPLOY_DUMMY_CMD="./gradlew $GRADLE_FLAGS -DgaeDeployVersion=$DUMMY_DEFAULT_VERSION -DgaePromote=true :grpc-gae-interop-testing-jdk8:appengineDeploy"
# Deploy the dummy 'default' version. We only require that it exists when cleanup() is called. # Deploy the dummy 'default' version. We only require that it exists when cleanup() is called.
# It ok if we race with another run and fail here, because the end result is idempotent. # It ok if we race with another run and fail here, because the end result is idempotent.
set +e set +e
$DUMMY_EXISTS_CMD if ! gcloud app versions describe "$DUMMY_DEFAULT_VERSION" --service="$KOKORO_GAE_SERVICE"; then
EXIST=$? ./gradlew $GRADLE_FLAGS -DgaeDeployVersion="$DUMMY_DEFAULT_VERSION" -DgaePromote=true :grpc-gae-interop-testing-jdk8:appengineDeploy
if [[ $EXIST != 0 ]]; then
$DEPLOY_DUMMY_CMD
else else
echo "default version already exists: $DUMMY_DEFAULT_VERSION" echo "default version already exists: $DUMMY_DEFAULT_VERSION"
fi fi