Skip to content

Commit

Permalink
Run the Android integration tests remotely again.
Browse files Browse the repository at this point in the history
The dynamic linking issue that required local execution has been fixed.

This should speed up Bazel CI runs, as we previously couldn't benefit from
previously cached test results.

One of the tests must remain non-remote because it currently exceeds the RBE
input limit (70k files). This is tracked in bazelbuild#17784.

Fixes bazelbuild#8235.
  • Loading branch information
tjgq committed Mar 15, 2023
1 parent f556833 commit e174f61
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 23 deletions.
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ list_source_repository(name = "local_bazel_source_list")
# 2. Set the $ANDROID_HOME and $ANDROID_NDK_HOME environment variables
# 3. Uncomment the two lines below
#
# android_sdk_repository(name = "androidsdk")
# android_ndk_repository(name = "androidndk")
android_sdk_repository(name = "androidsdk")
android_ndk_repository(name = "androidndk")

# In order to run //src/test/shell/bazel:maven_starlark_test, follow the
# instructions above for the Android integration tests and uncomment the
Expand Down
22 changes: 1 addition & 21 deletions src/test/shell/bazel/android/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ android_sh_test(
"//external:android_sdk_for_testing",
"//src/test/shell/bazel:test-deps",
],
# See https://github.com/bazelbuild/bazel/issues/8235
tags = [
"no-remote",
"no_windows",
# bzlmod test requires network
"requires-network",
Expand All @@ -55,9 +53,7 @@ android_sh_test(
"//external:android_sdk_for_testing",
"//src/test/shell/bazel:test-deps",
],
# See https://github.com/bazelbuild/bazel/issues/8235
tags = [
"no-remote",
"no_windows",
],
)
Expand All @@ -71,8 +67,6 @@ android_sh_test(
"//external:android_sdk_for_testing",
"//src/test/shell/bazel:test-deps",
],
# See https://github.com/bazelbuild/bazel/issues/8235
tags = ["no-remote"],
)

android_sh_test(
Expand All @@ -85,9 +79,7 @@ android_sh_test(
"//external:android_sdk_for_testing",
"//src/test/shell/bazel:test-deps",
],
# See https://github.com/bazelbuild/bazel/issues/8235
tags = [
"no-remote",
"no_windows",
],
)
Expand All @@ -101,8 +93,6 @@ android_sh_test(
"//external:android_sdk_for_testing",
"//src/test/shell/bazel:test-deps",
],
# See https://github.com/bazelbuild/bazel/issues/8235
tags = ["no-remote"],
)

android_sh_test(
Expand All @@ -115,9 +105,7 @@ android_sh_test(
"//src/test/shell/bazel:test-deps",
],
shard_count = 3,
# See https://github.com/bazelbuild/bazel/issues/8235
tags = [
"no-remote",
"no_windows",
],
)
Expand All @@ -134,7 +122,7 @@ android_sh_test(
"//src/test/shell/bazel:test-deps",
],
shard_count = 6,
# See https://github.com/bazelbuild/bazel/issues/8235
# Disable remote execution because we're over the input limit (70k).
tags = [
"no-remote",
"no_windows",
Expand All @@ -150,8 +138,6 @@ android_sh_test(
"//external:android_sdk_for_testing",
"//src/test/shell/bazel:test-deps",
],
# See https://github.com/bazelbuild/bazel/issues/8235
tags = ["no-remote"],
)

android_sh_test(
Expand All @@ -163,9 +149,7 @@ android_sh_test(
"//external:android_sdk_for_testing",
"//src/test/shell/bazel:test-deps",
],
# See https://github.com/bazelbuild/bazel/issues/8235
tags = [
"no-remote",
"no_windows",
],
)
Expand All @@ -180,9 +164,7 @@ android_sh_test(
"//src/test/shell/bazel:test-deps",
],
shard_count = 4,
# See https://github.com/bazelbuild/bazel/issues/8235
tags = [
"no-remote",
"no_windows",
],
)
Expand All @@ -197,6 +179,4 @@ android_sh_test(
"//external:android_sdk_for_testing",
"//src/test/shell/bazel:test-deps",
],
# See https://github.com/bazelbuild/bazel/issues/8235
tags = ["no-remote"],
)

0 comments on commit e174f61

Please sign in to comment.