Commit f9267b7
authored
Update Kokoro java versions (GoogleCloudPlatform#2059)
* Fix kokoro test versions
* trigger tests
* fix removal
* Fix error1 parent e9dd9fe commit f9267b7
6 files changed
Lines changed: 7 additions & 5 deletions
File tree
- .kokoro
- java11
- java8
- tests
- appengine-java11/http-server
- appengine-java8/analytics
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -32,7 +32,7 @@ action { | |||
| 32 | 32 | # Set the JAVA VERSION env var. | |
| 33 | 33 | env_vars: { | |
| 34 | 34 | key: "JAVA_VERSION" | |
| 35 | - value: "11" | ||
| 35 | + value: "1.8,11" | ||
| 36 | 36 | } | |
| 37 | 37 | ||
| 38 | 38 | # Configure the docker image for kokoro-trampoline. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -32,7 +32,7 @@ action { | |||
| 32 | 32 | # Set the JAVA VERSION env var. | |
| 33 | 33 | env_vars: { | |
| 34 | 34 | key: "JAVA_VERSION" | |
| 35 | - value: "1.8, 11" | ||
| 35 | + value: "1.8" | ||
| 36 | 36 | } | |
| 37 | 37 | ||
| 38 | 38 | # Configure the docker image for kokoro-trampoline. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -75,7 +75,7 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then | |||
| 75 | 75 | fi | |
| 76 | 76 | ||
| 77 | 77 | # Package local jetty dependency for Java11 samples | |
| 78 | - if [[ "$JAVA_VERSION" == "11" ]]; then | ||
| 78 | + if [[ ",$JAVA_VERSION," =~ "11" ]]; then | ||
| 79 | 79 | cd appengine-java11/appengine-simple-jetty-main/ | |
| 80 | 80 | mvn install --quiet | |
| 81 | 81 | cd ../../ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -34,6 +34,7 @@ | |||
| 34 | 34 | </archive> | |
| 35 | 35 | </configuration> | |
| 36 | 36 | </plugin> | |
| 37 | + | ||
| 37 | 38 | <plugin> | |
| 38 | 39 | <groupId>com.google.cloud.tools</groupId> | |
| 39 | 40 | <artifactId>appengine-maven-plugin</artifactId> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,4 +21,4 @@ To run this sample locally: | |||
| 21 | 21 | ||
| 22 | 22 | ## Deploying | |
| 23 | 23 | ||
| 24 | - $ mvn appengine:deploy | ||
| 24 | + $ mvn clean package appengine:deploy -Dapp.deploy.projectId=<your-project-id> | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -110,8 +110,9 @@ | |||
| 110 | 110 | <plugin> | |
| 111 | 111 | <groupId>com.google.cloud.tools</groupId> | |
| 112 | 112 | <artifactId>appengine-maven-plugin</artifactId> | |
| 113 | - <version>1.3.1</version> | ||
| 113 | + <version>2.2.0</version> | ||
| 114 | 114 | <configuration> | |
| 115 | + <version>analytics</version> | ||
| 115 | 116 | <deploy.promote>true</deploy.promote> | |
| 116 | 117 | <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion> | |
| 117 | 118 | </configuration> | |
0 commit comments