Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration test deflake #4176

Merged
merged 5 commits into from
Dec 4, 2018
Merged

Integration test deflake #4176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
978c1ab
Bump integration test timeout to 15 minutes from 10 minutes
chingor13 Dec 4, 2018
7a13f59
Call the maven test directly - no need for verify_single_it.sh
chingor13 Dec 4, 2018
c7a3c1e
provide spanner.testenv.instance property from Kokoro config
chingor13 Dec 4, 2018
f57c159
Bump integration test timeout to 20 minutes
chingor13 Dec 4, 2018
3d09dd0
Fix syntax
chingor13 Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .kokoro/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
;;
*)
;;
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/spanner-it.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
1 change: 0 additions & 1 deletion google-cloud-clients/google-cloud-spanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-clients/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
</execution>
</executions>
<configuration>
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<reportNameSuffix>sponge_log</reportNameSuffix>
</configuration>
</plugin>
Expand Down