Skip to content

Commit

Permalink
Re enable android tests
Browse files Browse the repository at this point in the history 
Work towards #18776.

Centos tests are still disabled because of python version issues: #18776 (comment)

Closes #20348.

PiperOrigin-RevId: 587674122
Change-Id: Id99b09d9dc184f015f02e4ebc921dcfa58adcc45
  • Loading branch information
@katre @Wyverald
katre authored and Wyverald committed Jan 3, 2024
1 parent baf5f62 commit 7ae32f3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 50 deletions.
26 changes: 1 addition & 25 deletions .bazelci/postsubmit.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tasks:
- "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
- "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
- "-//src/test/shell/bazel:bazel_coverage_sh_test"
# https://github.com/bazelbuild/bazel/issues/18776
# Centos7 uses python 2 by default, 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"
Expand Down Expand Up @@ -83,11 +83,6 @@ tasks:
- "//tools/bash/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# 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"
include_json_profile:
- build
- test
Expand Down Expand Up @@ -148,11 +143,6 @@ tasks:
- "//tools/bash/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# 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"
include_json_profile:
- build
- test
Expand Down Expand Up @@ -200,11 +190,6 @@ tasks:
- "-//src/test/shell/bazel/apple:bazel_apple_test"
# https://github.com/bazelbuild/bazel/issues/17408
- "-//src/test/shell/bazel/apple:bazel_objc_test"
# 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"
# https://github.com/bazelbuild/bazel/issues/17410
- "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
# https://github.com/bazelbuild/bazel/issues/17411
Expand Down Expand Up @@ -254,10 +239,6 @@ tasks:
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
# MacOS does not have cgroups so it can't support hardened sandbox
- "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
# https://github.com/bazelbuild/bazel/issues/16521 & https://github.com/bazelbuild/bazel/issues/18776
- "-//src/test/shell/bazel/android/..."
- "-//src/tools/android/java/com/google/devtools/build/android/..."
- "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
# https://github.com/bazelbuild/bazel/issues/16525
- "-//src/test/java/com/google/devtools/build/lib/buildtool:KeepGoingTest"
- "-//src/test/java/com/google/devtools/build/lib/buildtool:DanglingSymlinkTest"
Expand Down Expand Up @@ -396,11 +377,6 @@ tasks:
- "-//src/test/py/bazel:bazel_yanked_versions_test"
- "-//src/test/py/bazel:bzlmod_query_test"
- "-//src/test/shell/bazel:verify_workspace"
# 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"
include_json_profile:
- build
- test
Expand Down
26 changes: 1 addition & 25 deletions .bazelci/presubmit.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tasks:
- "-//src/test/shell/bazel:bazel_coverage_cc_released_test_gcc"
- "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
- "-//src/test/shell/bazel:bazel_coverage_sh_test"
# https://github.com/bazelbuild/bazel/issues/18776
# Centos7 uses python 2 by default, 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"
Expand Down Expand Up @@ -85,11 +85,6 @@ tasks:
- "//tools/bash/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# 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"
include_json_profile:
- build
- test
Expand Down Expand Up @@ -151,11 +146,6 @@ tasks:
- "//tools/bash/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# 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"
include_json_profile:
- build
- test
Expand Down Expand Up @@ -204,11 +194,6 @@ tasks:
# - "-//src/test/shell/bazel/apple:bazel_apple_test"
# # https://github.com/bazelbuild/bazel/issues/17408
# - "-//src/test/shell/bazel/apple:bazel_objc_test"
# # 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"
# # https://github.com/bazelbuild/bazel/issues/17410
# - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
# # https://github.com/bazelbuild/bazel/issues/17411
Expand Down Expand Up @@ -259,10 +244,6 @@ tasks:
# - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
# # MacOS does not have cgroups so it can't support hardened sandbox
# - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
# # https://github.com/bazelbuild/bazel/issues/16521 & https://github.com/bazelbuild/bazel/issues/18776
# - "-//src/test/shell/bazel/android/..."
# - "-//src/tools/android/java/com/google/devtools/build/android/..."
# - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
# # https://github.com/bazelbuild/bazel/issues/16525
# - "-//src/test/java/com/google/devtools/build/lib/buildtool:KeepGoingTest"
# - "-//src/test/java/com/google/devtools/build/lib/buildtool:DanglingSymlinkTest"
Expand Down Expand Up @@ -460,11 +441,6 @@ tasks:
# Flaky on rbe_ubuntu2004
# https://github.com/bazelbuild/continuous-integration/issues/1631
- "-//src/test/shell/bazel:bazel_sandboxing_networking_test"
# 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"
include_json_profile:
- build
- test
Expand Down

0 comments on commit 7ae32f3

Please sign in to comment.