Skip to content

Commit fcc3103

Browse files
authored
Revert "fix: re-enable spanner backup tests w/ increased timeout (#4313)" (#4316)
This reverts commit 5b18a43. We still saw a timeout from spanner backup test after 15 minutes: https://source.cloud.google.com/results/invocations/9d52df69-7276-47a5-891a-46237d11178d/targets/cloud-cpp%2Fgithub%2Fgoogle-cloud-cpp%2Fmaster%2Fdocker%2Fintegration/log [ RUN ] BackupTestWithCleanup.BackupTestSuite google/cloud/spanner/integration_tests/backup_integration_test.cc:169: Failure Value of: backup Expected: is OK Actual: exhausted polling policy with no previous error [DEADLINE_EXCEEDED] However, this was not a bazel timeout, it was a timeout in the code, I think, from this code: google-cloud-cpp/google/cloud/spanner/testing/policies.h Line 29 in 0bf38cf auto constexpr kMaximumWaitTimeMinutes = 15; I'm reverting this to stop the flakes. We should then re-enable the spanner backup tests after we've re-evaluated all the retries, timeouts, etc, and we understand why/where the tests take all the time.
1 parent fad7885 commit fcc3103

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

ci/kokoro/docker/build-in-docker-bazel.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,7 @@ io::log "Using Bazel in ${BAZEL_BIN}"
4141
"${BAZEL_BIN}" version
4242
echo "================================================================"
4343

44-
bazel_args=(
45-
# Sets the test timeouts for small, medium, large, and enormous tests as
46-
# defined by the test's "size" attribute (or "timeout") in its BUILD file. A
47-
# value of -1 means to use bazel's default. Here we want to increase the
48-
# "large" test timeout from 15 to 25 min (the argument is in seconds).
49-
# See: https://docs.bazel.build/versions/master/be/common-definitions.html
50-
"--test_timeout=-1,-1,1500,-1"
51-
"--test_output=errors"
52-
"--verbose_failures=true"
53-
"--keep_going"
54-
)
44+
bazel_args=("--test_output=errors" "--verbose_failures=true" "--keep_going")
5545
if [[ -n "${RUNS_PER_TEST}" ]]; then
5646
bazel_args+=("--runs_per_test=${RUNS_PER_TEST}")
5747
fi

ci/kokoro/docker/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ elif [[ "${BUILD_NAME}" = "integration" ]]; then
9595
export DISTRO=ubuntu
9696
export DISTRO_VERSION=18.04
9797
RUN_INTEGRATION_TESTS="yes" # Integration tests were explicitly requested.
98-
GOOGLE_CLOUD_CPP_SPANNER_SLOW_INTEGRATION_TESTS="instance,backup"
98+
# TODO(4306): Enable the backup tests once they don't timeout too often.
99+
GOOGLE_CLOUD_CPP_SPANNER_SLOW_INTEGRATION_TESTS="instance"
99100
in_docker_script="ci/kokoro/docker/build-in-docker-bazel.sh"
100101
elif [[ "${BUILD_NAME}" = "integration-nightly" ]]; then
101102
export DISTRO=ubuntu

0 commit comments

Comments
 (0)