Integration test deflake (#4176)

* Bump integration test timeout to 15 minutes from 10 minutes * Call the maven test directly - no need for verify_single_it.sh * provide spanner.testenv.instance property from Kokoro config * Bump integration test timeout to 20 minutes * Fix syntax
googleapis · Dec 4, 2018 · e2fc8a0 · e2fc8a0
1 parent 0f68cb8
commit e2fc8a0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -25,7 +25,7 @@ mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=tr
 
 # prepend Kokoro root directory onto GOOGLE_APPLICATION_CREDENTIALS path
 if [ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
-    export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}
+    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
 
 case $JOB_TYPE in
@@ -40,7 +40,7 @@ javadoc)
     mvn javadoc:javadoc javadoc:test-javadoc
     ;;
 integration)
-    ./utilities/verify_single_it.sh $INTEGRATION_TEST_ARGS
+    mvn -B -pl ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify
     ;;
 *)
     ;;

diff --git a/.kokoro/presubmit/spanner-it.cfg b/.kokoro/presubmit/spanner-it.cfg
@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
     key: "INTEGRATION_TEST_ARGS"
-    value: "google-cloud-clients/google-cloud-spanner"
+    value: "google-cloud-clients/google-cloud-spanner -Dspanner.testenv.instance=projects/gcloud-devel/instances/spanner-testing"
 }
 
 env_vars: {

diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -59,7 +59,6 @@
         <configuration>
           <systemPropertyVariables>
             <spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
-            <spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing</spanner.testenv.instance>
           </systemPropertyVariables>
           <groups>com.google.cloud.spanner.IntegrationTest</groups>
           <excludedGroups>com.google.cloud.spanner.FlakyTest</excludedGroups>

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
@@ -582,7 +582,7 @@
           </execution>
         </executions>
         <configuration>
-          <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+          <forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
           <reportNameSuffix>sponge_log</reportNameSuffix>
         </configuration>
       </plugin>