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 \ 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 @@ default - com.google.cloud.spanner.SerialIntegrationTest - - - - - parallel-integration-test - - integration-test - - - com.google.cloud.spanner.ParallelIntegrationTest - 8 - true + com.google.cloud.spanner.SerialIntegrationTest, com.google.cloud.spanner.ParallelIntegrationTest