diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2017-09-06 20:57:23 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-09-07 09:57:38 +0200 |
| commit | 5da5572254555704f88fd2e0061237fd35a50f9c (patch) | |
| tree | c54dcf4de3d301f6d9b9d3eb3fca23a69e684b16 /scripts | |
| parent | 9b6cf941461769becc06e30d4fd0c2007066abbd (diff) | |
Shard further docker-tests and use tags for sharding
To select which test to run on bazel-docker-tests, use
the docker and shard- tag intead of hard to read queries and
shard based on the compilation mode.
Also copy the file to bazel-slow-tests in prevision from
renaming the job on CI.
Issue bazelbuild/continuous-integration#98.
Change-Id: Ie8e9a21c5a1ce93c9ecaa74cbb2734c150c7f592
PiperOrigin-RevId: 167752261
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci/bazel-docker-tests.json | 29 | ||||
| -rw-r--r-- | scripts/ci/bazel-slow-tests.json | 23 | ||||
| -rw-r--r-- | scripts/ci/bazel-tests.json | 9 |
3 files changed, 43 insertions, 18 deletions
diff --git a/scripts/ci/bazel-docker-tests.json b/scripts/ci/bazel-docker-tests.json index 0fc2cd2155..02a76e4ee8 100644 --- a/scripts/ci/bazel-docker-tests.json +++ b/scripts/ci/bazel-docker-tests.json @@ -1,22 +1,23 @@ [ { "node": "docker", - "shard": "1", + "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": [ - "filter(ubuntu, //src/test/docker/...)" - ] - } - }, - { - "node": "docker", - "shard": "2", - "parameters": { - "targets": [], - "tests": [ - "//src/test/docker/... - filter(ubuntu, //src/test/docker/...)" - ] + "tests": ["//src/test/docker/..."] } } ] diff --git a/scripts/ci/bazel-slow-tests.json b/scripts/ci/bazel-slow-tests.json new file mode 100644 index 0000000000..02a76e4ee8 --- /dev/null +++ b/scripts/ci/bazel-slow-tests.json @@ -0,0 +1,23 @@ +[ + { + "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-tests.json b/scripts/ci/bazel-tests.json index 076136a276..08233a37ec 100644 --- a/scripts/ci/bazel-tests.json +++ b/scripts/ci/bazel-tests.json @@ -22,10 +22,11 @@ ], "tests": [ "//scripts/...", - "filter(\"^(?!//src/test/docker).*$\", //src/test/...)", + "//src/test/...", "//third_party/ijar/...", "//tools/android/..." ], + "test_tag_filters": ["-docker"], "targets": [] } }, { @@ -71,11 +72,11 @@ "build_opts": ["--define IPHONE_SDK=1"], "tests": [ "//scripts/...", - "filter(\"^(?!//src/test/docker).*$\", //src/test/...)", + "//src/test/...", "//third_party/ijar/...", - "//tools/android/...", - "//src/test/shell/bazel:cpp_darwin_integration_test" + "//tools/android/..." ], + "test_tag_filters": ["-docker"], "targets": [] } }, { |