aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts/ci
diff options
context:
space:
mode:
authorGravatar Klaus Aehlig <aehlig@google.com>2017-08-25 15:42:57 +0200
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-08-25 16:04:55 +0200
commit36fdbc737076064e07568f9d2c872d2115101852 (patch)
tree8c3e3199630d6b63aa5b4dd6015b1126b5e8ca16 /scripts/ci
parent3d2feca630fc4247344ef46ab246f0bb1938e592 (diff)
Increase size of //src/test/shell/integration:java_integration_test
...and re-enable of FreeBSD. It turns out that the timeout-flakyness was just because the CI machines weren't fast enough. Running the test 150 times showed no further timeout. Fixes #3614. Change-Id: Icdf2f91b1fe91e22117c3cf6d3fda9409d473198 PiperOrigin-RevId: 166470850
Diffstat (limited to 'scripts/ci')
-rw-r--r--scripts/ci/bazel-tests.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/ci/bazel-tests.json b/scripts/ci/bazel-tests.json
index bbe6dc1b8e..d0a81d599e 100644
--- a/scripts/ci/bazel-tests.json
+++ b/scripts/ci/bazel-tests.json
@@ -59,8 +59,7 @@
"{} +"
],
"tests": [
- // java_integration_test is timeout flaky on FreeBSD...
- "//src/test/shell/integration/... - //src/test/shell/integration:java_integration_test",
+ "//src/test/shell/integration/...",
"let bazel=\"//src/test/shell/bazel/...\" in $bazel - filter(\"all_tests\", $bazel) - filter(\"jdk\", $bazel) - filter(\"maven\", $bazel) - filter(\"android\", $bazel) - filter(\"java\", $bazel) - filter(\"workspace\", $bazel) - filter(\"external\", $bazel) - filter(\"example\", $bazel) - filter(\"skylark_repository\", $bazel) - filter(\"repository_cache\", $bazel)"
],
"targets": []