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

buildscripts,gae-interop-testing: Hardcode service name 

This simplifies the kokoro script and makes things consistent between
the gradle script behavior and kokoro behavior.
This commit is contained in:
Spencer Fang 2018-08-16 12:02:39 -07:00 committed by zpencer
parent 3792242ae1
commit b821cf13b0
3 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,15 +26,6 @@ cd ./github/grpc-java
## ##
## Deploy the dummy 'default' version of the service ## Deploy the dummy 'default' version of the service
## ##
echo "<?xml version='1.0' encoding='utf-8'?>
<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
<threadsafe>true</threadsafe>
<service>$KOKORO_GAE_SERVICE</service>
<runtime>java8</runtime>
</appengine-web-app>
" > ./gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
cat ./gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
GRADLE_FLAGS="--stacktrace -DgaeStopPreviousVersion=false -DgaePromote=false -PskipCodegen=true" GRADLE_FLAGS="--stacktrace -DgaeStopPreviousVersion=false -DgaePromote=false -PskipCodegen=true"
DUMMY_EXISTS_CMD="gcloud app versions describe $DUMMY_DEFAULT_VERSION --service=$KOKORO_GAE_SERVICE" DUMMY_EXISTS_CMD="gcloud app versions describe $DUMMY_DEFAULT_VERSION --service=$KOKORO_GAE_SERVICE"
DEPLOY_DUMMY_CMD="./gradlew $GRADLE_FLAGS -DgaeDeployVersion=$DUMMY_DEFAULT_VERSION :grpc-gae-interop-testing-jdk8:appengineDeploy" DEPLOY_DUMMY_CMD="./gradlew $GRADLE_FLAGS -DgaeDeployVersion=$DUMMY_DEFAULT_VERSION :grpc-gae-interop-testing-jdk8:appengineDeploy"
@ -51,33 +42,11 @@ else
fi fi
set -e set -e
##
## Begin JDK8 test
##
echo "<?xml version='1.0' encoding='utf-8'?>
<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
<threadsafe>true</threadsafe>
<service>$KOKORO_GAE_SERVICE</service>
<runtime>java8</runtime>
</appengine-web-app>
" > ./gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
cat ./gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
# Deploy and test the real app (jdk8) # Deploy and test the real app (jdk8)
./gradlew $GRADLE_FLAGS -DgaeDeployVersion=$KOKORO_GAE_APP_VERSION :grpc-gae-interop-testing-jdk8:runInteropTestRemote ./gradlew $GRADLE_FLAGS -DgaeDeployVersion="$KOKORO_GAE_APP_VERSION" :grpc-gae-interop-testing-jdk8:runInteropTestRemote
##
## Begin JDK7 test
##
echo "<?xml version='1.0' encoding='utf-8'?>
<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
<threadsafe>true</threadsafe>
<service>$KOKORO_GAE_SERVICE</service>
<runtime>java7</runtime>
</appengine-web-app>
" > ./gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml
cat ./gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml
# Deploy and test the real app (jdk7) # Deploy and test the real app (jdk7)
./gradlew $GRADLE_FLAGS -DgaeDeployVersion=$KOKORO_GAE_APP_VERSION :grpc-gae-interop-testing-jdk7:runInteropTestRemote ./gradlew $GRADLE_FLAGS -DgaeDeployVersion="$KOKORO_GAE_APP_VERSION" :grpc-gae-interop-testing-jdk7:runInteropTestRemote
set +e set +e
echo "Cleaning out stale deploys from previous runs, it is ok if this part fails" echo "Cleaning out stale deploys from previous runs, it is ok if this part fails"

5
gae-interop-testing/gae-jdk7/src/main/webapp/WEB-INF/appengine-web.xml
View File

@ -12,10 +12,9 @@
limitations under the License. limitations under the License.
--> -->
<!-- [START config] --> <!-- [START config] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> <appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
<application>YOUR-PROJECT-ID</application>
<version>YOUR-VERSION-ID</version>
<threadsafe>true</threadsafe> <threadsafe>true</threadsafe>
<service>java-gae-interop-test</service>
<runtime>java7</runtime> <runtime>java7</runtime>
</appengine-web-app> </appengine-web-app>
<!-- [END config] --> <!-- [END config] -->

5
gae-interop-testing/gae-jdk8/src/main/webapp/WEB-INF/appengine-web.xml
View File

@ -12,10 +12,9 @@
limitations under the License. limitations under the License.
--> -->
<!-- [START config] --> <!-- [START config] -->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> <appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
<application>YOUR-PROJECT-ID</application>
<version>YOUR-VERSION-ID</version>
<threadsafe>true</threadsafe> <threadsafe>true</threadsafe>
<service>java-gae-interop-test</service>
<runtime>java8</runtime> <runtime>java8</runtime>
</appengine-web-app> </appengine-web-app>
<!-- [END config] --> <!-- [END config] -->