From 1a92af06382dcaed80fb238b8c97270ad5c47585 Mon Sep 17 00:00:00 2001
From: Thiago Nunes <thiagotnunes@google.com>
Date: Fri, 24 Sep 2021 22:28:06 +1000
Subject: [PATCH 1/2] chore: fix failsafe plugin hanging

---
 .kokoro/build.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index c8c09af3fa5..55441238bf8 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,7 +47,10 @@ set +e
 
 case ${JOB_TYPE} in
 test)
-    mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+    mvn test -B \
+      -Dclirr.skip=true \
+      -Denforcer.skip=true \
+      -Djava.net.preferIPv4Stack=true
     RETURN_CODE=$?
     ;;
 lint)
@@ -62,6 +65,7 @@ integration)
     mvn -B ${INTEGRATION_TEST_ARGS} \
       -ntp \
       -Penable-integration-tests \
+      -Djava.net.preferIPv4Stack=true \
       -DtrimStackTrace=false \
       -Dclirr.skip=true \
       -Denforcer.skip=true \
@@ -73,6 +77,7 @@ slowtests)
   mvn -B ${INTEGRATION_TEST_ARGS} \
     -ntp \
     -Pslow-tests \
+    -Djava.net.preferIPv4Stack=true \
     -DskipITs=false \
     -DtrimStackTrace=false \
     -Dclirr.skip=true \

From 43c1b4de2c42a1d646826f2e26016f3ed70ec28c Mon Sep 17 00:00:00 2001
From: Thiago Nunes <thiagotnunes@google.com>
Date: Mon, 27 Sep 2021 18:06:56 +1000
Subject: [PATCH 2/2] chore: try running all tests serially

---
 google-cloud-spanner/pom.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index 196217dc327..382da6215b1 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -81,19 +81,7 @@
           <execution>
             <id>default</id>
             <configuration>
-              <groups>com.google.cloud.spanner.SerialIntegrationTest</groups>
-            </configuration>
-          </execution>
-          <!-- Executes parallel integration tests -->
-          <execution>
-            <id>parallel-integration-test</id>
-            <goals>
-              <goal>integration-test</goal>
-            </goals>
-            <configuration>
-              <groups>com.google.cloud.spanner.ParallelIntegrationTest</groups>
-              <forkCount>8</forkCount>
-              <reuseForks>true</reuseForks>
+              <groups>com.google.cloud.spanner.SerialIntegrationTest, com.google.cloud.spanner.ParallelIntegrationTest</groups>
             </configuration>
           </execution>
         </executions>