diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2017-09-07 16:03:02 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-09-08 09:47:17 +0200 |
| commit | f5dc80b3f5d2a4bc0875ffc177fd2d6a161f1246 (patch) | |
| tree | 1e5151158f50006da39a5cae81ea88166adb6a59 /scripts | |
| parent | a5f6193066ee6eab13f7a6440c78f7d47f81cf1f (diff) | |
Move bazel_determinism_test to bazel-slow-test job
Now every test labelled slow will be moved to that job.
Issue bazelbuild/continuous-integration#98.
Change-Id: I37baa0f4233201557493a8fac643e571026fcd93
PiperOrigin-RevId: 167854935
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci/bazel-docker-tests.json | 23 | ||||
| -rw-r--r-- | scripts/ci/bazel-slow-tests.json | 15 | ||||
| -rw-r--r-- | scripts/ci/bazel-tests.json | 15 |
3 files changed, 26 insertions, 27 deletions
diff --git a/scripts/ci/bazel-docker-tests.json b/scripts/ci/bazel-docker-tests.json deleted file mode 100644 index 02a76e4ee8..0000000000 --- a/scripts/ci/bazel-docker-tests.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "node": "docker", - "configurations": [ - { - "shard": 1, - "parameters": {"test_tag_filters": ["docker", "shard-1"]} - }, - { - "shard": 2, - "parameters": {"test_tag_filters": ["docker", "shard-2"]} - }, - { - "shard": 3, - "parameters": {"test_tag_filters": ["docker", "shard-3"]} - } - ], - "parameters": { - "targets": [], - "tests": ["//src/test/docker/..."] - } - } -] diff --git a/scripts/ci/bazel-slow-tests.json b/scripts/ci/bazel-slow-tests.json index 02a76e4ee8..943d4647f6 100644 --- a/scripts/ci/bazel-slow-tests.json +++ b/scripts/ci/bazel-slow-tests.json @@ -19,5 +19,20 @@ "targets": [], "tests": ["//src/test/docker/..."] } + }, + { + "configurations": [ + {"node": "linux-x86_64"}, + {"node": "ubuntu_16.04-x86_64"}, + {"node": "darwin-x86_64"} + // TODO(aehlig): {"node": "freebsd-11"}, + // TODO(aehlig): {"node": "freebsd-12"}, + // TODO(pcloudy): {"node": "windows-x86_64"}, + ], + "parameters": { + "targets": [], + "tests": ["//src/test/..."] + "parameters": {"test_tag_filters": ["-docker", "slow"]} + } } ] diff --git a/scripts/ci/bazel-tests.json b/scripts/ci/bazel-tests.json index 08233a37ec..f8d3564935 100644 --- a/scripts/ci/bazel-tests.json +++ b/scripts/ci/bazel-tests.json @@ -26,7 +26,7 @@ "//third_party/ijar/...", "//tools/android/..." ], - "test_tag_filters": ["-docker"], + "test_tag_filters": ["-slow"], "targets": [] } }, { @@ -51,6 +51,7 @@ "//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)" ], + "test_tag_filters": ["-slow"], "targets": [] } }, { @@ -76,7 +77,7 @@ "//third_party/ijar/...", "//tools/android/..." ], - "test_tag_filters": ["-docker"], + "test_tag_filters": ["-slow"], "targets": [] } }, { @@ -94,7 +95,10 @@ // ASSERT_DEATH will try to write to C:/Windows, then fails. "--test_env=TEMP" ], - "test_tag_filters": ["-no_windows"], + "test_tag_filters": [ + "-no_windows", + "-slow" + ], "tests": [ "//src/test/py/...", "//src/test/java/...", @@ -112,7 +116,10 @@ "node": "windows-x86_64", "parameters": { "build_opts": ["--cpu=x64_windows_msys", "--host_cpu=x64_windows_msys"], - "test_tag_filters": ["-no_windows"], + "test_tag_filters": [ + "-no_windows", + "-slow" + ], "tests": [], "targets": ["//examples/cpp:hello-world"] } |