Disable android tests in Bazel presubmit and postsubmit.

We are moving android tests out of Bazel repo. PiperOrigin-RevId: 650742822 Change-Id: I2a0363b91420e744cdeeecc82eebfbcd727d306d
bazelbuild · Jul 9, 2024 · 34b926b · 34b926b
1 parent 3a467b2
commit 34b926b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
@@ -201,11 +201,10 @@ tasks:
       - "-//src/test/shell/bazel:jdeps_test"
       # https://github.com/bazelbuild/bazel/issues/21495
       - "-//src/test/shell/bazel:srcs_test"
-      # Macs can't find python, so these fail: https://github.com/bazelbuild/bazel/issues/18776
-      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
-      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
-      - "-//src/test/shell/bazel/android:aapt_integration_test"
-      - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
+      # Disable android tests since we are moving them out of Bazel repo.
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/tools/android/java/com/google/devtools/build/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
       # ServerTests frequently runs into deadlocks on Intel Macs
       - "-//src/test/java/com/google/devtools/build/lib/server:ServerTests"
       # bazel_proto_library_test is timeout flaky on Intel Macs, which usually means a runtime of 2 hours or more

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -208,26 +208,22 @@ tasks:
       - "-//src/test/shell/bazel:jdeps_test"
       # https://github.com/bazelbuild/bazel/issues/21495
       - "-//src/test/shell/bazel:srcs_test"
-      # Macs can't find python, so these fail: https://github.com/bazelbuild/bazel/issues/18776
-      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
-      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
-      - "-//src/test/shell/bazel/android:aapt_integration_test"
-      - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
+      # Disable android tests since we are moving them out of Bazel repo.
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/tools/android/java/com/google/devtools/build/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
       # Disable the top 50 most time-consuming tests on macOS Intel platform in presubmit.
       # Those tests are still covered in postsubmit and by macOS arm64 platform in presubmit.
       # To run any of the following test in presubmit, just comment out the corresponding line.
       # TODO(pcloudy): Disable the android tests after enabling them on Apple Silicon platform.
       - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
-      # - "-//src/test/shell/bazel/android:android_integration_test"
-      # - "-//src/test/shell/bazel/android:android_integration_test_with_head_android_tools"
       - "-//src/test/shell/bazel:bazel_proto_library_test"
       - "-//src/test/py/bazel:runfiles_test"
       - "-//src/test/shell/integration:loading_phase_tests"
       - "-//src/test/py/bazel:bazel_module_test"
       - "-//src/test/shell/integration:target_compatible_with_test"
       - "-//src/test/shell/integration:bazel_json_worker_test"
       - "-//src/test/shell/bazel:bazel_coverage_java_jdk21_toolchain_head_test"
-      # - "-//src/test/shell/bazel/android:aar_integration_test"
       - "-//src/test/shell/bazel:bazel_coverage_java_test"
       - "-//src/test/shell/bazel:bazel_java_test_jdk21_toolchain_head"
       - "-//src/test/shell/bazel:starlark_git_repository_test"
@@ -244,11 +240,7 @@ tasks:
       - "-//src/test/shell/integration:sandboxing_test"
       - "-//src/test/shell/bazel:bazel_java_test"
       - "-//src/test/py/bazel:bzlmod_query_test"
-      # - "-//src/test/shell/bazel/android:desugarer_integration_test"
-      # - "-//src/test/shell/bazel/android:desugarer_integration_test_with_head_android_tools"
       - "-//src/test/py/bazel:bazel_external_repository_test"
-      # - "-//src/test/shell/bazel/android:resource_processing_integration_test"
-      # - "-//src/test/shell/bazel/android:aar_integration_test_with_head_android_tools"
       - "-//src/tools/singlejar:zip64_test"
       - "-//src/test/py/bazel:launcher_test"
       - "-//src/test/shell/integration:bazel_worker_test"
@@ -258,7 +250,6 @@ tasks:
       - "-//src/test/shell/bazel:path_mapping_test"
       - "-//src/test/shell/integration:toolchain_test"
       - "-//src/test/shell/integration:execution_phase_tests"
-      # - "-//src/test/shell/bazel/android:resource_processing_integration_test_with_head_android_tools"
       - "-//src/test/shell/integration:aquery_test"
       - "-//src/test/py/bazel:mod_command_test"
       # ServerTests frequently runs into deadlocks on Intel Macs
@@ -303,7 +294,7 @@ tasks:
       - "//tools/bash/..."
       # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
-      # https://github.com/bazelbuild/bazel/issues/16521 & https://github.com/bazelbuild/bazel/issues/18776
+      # Disable android tests since we are moving them out of Bazel repo.
       - "-//src/test/shell/bazel/android/..."
       - "-//src/tools/android/java/com/google/devtools/build/android/..."
       - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"