diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f96afb9019d0..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=${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 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 @@ com.google.cloud.spanner.GceTestEnvConfig - projects/gcloud-devel/instances/spanner-testing com.google.cloud.spanner.IntegrationTest com.google.cloud.spanner.FlakyTest diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index 7727cad243cb..75c49208073f 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -582,7 +582,7 @@ - 600 + 1200 sponge_log