From 978c1abcab23910f9aea888706a0f47991994eca Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 4 Dec 2018 12:15:01 -0800
Subject: [PATCH 1/5] Bump integration test timeout to 15 minutes from 10
 minutes

---
 google-cloud-clients/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 7727cad243cb..734e96c6d46e 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -582,7 +582,7 @@
           </execution>
         </executions>
         <configuration>
-          <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+          <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
           <reportNameSuffix>sponge_log</reportNameSuffix>
         </configuration>
       </plugin>

From 7a13f5970f360bbf6c4e5a7b0295d25e99a3e5d6 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 4 Dec 2018 12:15:40 -0800
Subject: [PATCH 2/5] Call the maven test directly - no need for
 verify_single_it.sh

---
 .kokoro/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index f96afb9019d0..8ed3840a82fe 100755
--- 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
     ;;
 *)
     ;;

From c7a3c1e4abfbcc4d9e200c463b6fc9127e5f894b Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 4 Dec 2018 12:16:13 -0800
Subject: [PATCH 3/5] provide spanner.testenv.instance property from Kokoro
 config

---
 .kokoro/presubmit/spanner-it.cfg                  | 2 +-
 google-cloud-clients/google-cloud-spanner/pom.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.kokoro/presubmit/spanner-it.cfg b/.kokoro/presubmit/spanner-it.cfg
index 8e48d717702c..8b978444a88e 100644
--- 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
index 4393bd7c51e0..7fcdc13b82d4 100644
--- 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>

From f57c1592349fa7534674c4ee4f88c3da78df39e8 Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 4 Dec 2018 13:10:50 -0800
Subject: [PATCH 4/5] Bump integration test timeout to 20 minutes

---
 google-cloud-clients/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 734e96c6d46e..75c49208073f 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -582,7 +582,7 @@
           </execution>
         </executions>
         <configuration>
-          <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
+          <forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
           <reportNameSuffix>sponge_log</reportNameSuffix>
         </configuration>
       </plugin>

From 3d09dd066ab51f7908c6c9052899300cc28bf93a Mon Sep 17 00:00:00 2001
From: Jeff Ching <chingor@google.com>
Date: Tue, 4 Dec 2018 13:35:46 -0800
Subject: [PATCH 5/5] Fix syntax

---
 .kokoro/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 8ed3840a82fe..55c2b0b3da60 100755
--- 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=realpath(${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
+    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
 fi
 
 case $JOB_TYPE in