Disable some Android tests in Bazel CI

- Removed the need of android_skd_repository in WORKSPACE.bzlmod - Synced postsubmit.yml with presubmit.yml Follow up on: #23570 PiperOrigin-RevId: 674361203 Change-Id: I6ab9f987563771d2ac8887b62b44d4ac140b15f3
bazelbuild · Sep 13, 2024 · 2a7aa77 · 2a7aa77
1 parent dddc6ea
commit 2a7aa77
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 67 deletions.
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
@@ -3,8 +3,6 @@
 tasks:
  centos7:
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -28,6 +26,7 @@ tasks:
  - "//src/main/starlark/tests/builtins_bzl/..."
  - "//src/test/..."
  - "//src/tools/execlog/..."
+ - "//src/tools/one_version/..."
  - "//src/tools/singlejar/..."
  - "//src/tools/workspacelog/..."
  - "//third_party/ijar/..."
@@ -41,13 +40,14 @@ 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"
+ # Disable some Android tests since we are moving Android rules out of the Bazel repo.
+ - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
  fedora39:
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -61,8 +61,6 @@ tasks:
  - test
  ubuntu2204:
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -80,13 +78,17 @@ tasks:
  - "//src/main/starlark/tests/builtins_bzl/..."
  - "//src/test/..."
  - "//src/tools/execlog/..."
+ - "//src/tools/one_version/..."
  - "//src/tools/singlejar/..."
  - "//src/tools/workspacelog/..."
  - "//third_party/ijar/..."
  - "//tools/android/..."
  - "//tools/aquery_differ/..."
  - "//tools/python/..."
  - "//tools/bash/..."
+ # Disable some Android tests since we are moving Android rules out of the Bazel repo.
+ - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
@@ -97,8 +99,6 @@ tasks:
  CC_CONFIGURE_DEBUG: 1
  name: "Clang"
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -117,8 +117,6 @@ tasks:
  - test
  ubuntu2004:
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -136,21 +134,23 @@ tasks:
  - "//src/main/starlark/tests/builtins_bzl/..."
  - "//src/test/..."
  - "//src/tools/execlog/..."
+ - "//src/tools/one_version/..."
  - "//src/tools/singlejar/..."
  - "//src/tools/workspacelog/..."
  - "//third_party/ijar/..."
  - "//tools/android/..."
  - "//tools/aquery_differ/..."
  - "//tools/python/..."
  - "//tools/bash/..."
+ # Disable some Android tests since we are moving Android rules out of the Bazel repo.
+ - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
  macos:
  shards: 5
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  - ln -sf $OUTPUT_BASE/external $HOME/bazeltest/external
@@ -169,6 +169,7 @@ tasks:
  - "//src/main/starlark/tests/builtins_bzl/..."
  - "//src/test/..."
  - "//src/tools/execlog/..."
+ - "//src/tools/one_version/..."
  - "//src/tools/singlejar/..."
  - "//src/tools/workspacelog/..."
  - "//third_party/ijar/..."
@@ -181,9 +182,10 @@ tasks:
  - "-//src/test/py/..."
  # https://github.com/bazelbuild/bazel/issues/17410
  - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
- # Disable android tests since we are moving Android rules out of Bazel repo.
+ # Disable android tests since we are moving Android rules out of the Bazel repo.
  - "-//src/tools/android/java/com/google/devtools/build/android/..."
  - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
+ - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
  # ServerTests frequently runs into deadlocks on Intel Macs
  - "-//src/test/java/com/google/devtools/build/lib/server:ServerTests"
  # Add back a few Apple specific tests
@@ -196,8 +198,6 @@ tasks:
  macos_arm64:
  shards: 5
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  - ln -sf $OUTPUT_BASE/external $HOME/bazeltest/external
@@ -214,6 +214,7 @@ tasks:
  - "//src/main/starlark/tests/builtins_bzl/..."
  - "//src/test/..."
  - "//src/tools/execlog/..."
+ - "//src/tools/one_version/..."
  - "//src/tools/singlejar/..."
  - "//src/tools/workspacelog/..."
  - "//third_party/ijar/..."
@@ -227,15 +228,15 @@ tasks:
  - "-//src/test/shell/bazel/android/..."
  - "-//src/tools/android/java/com/google/devtools/build/android/..."
  - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
+ - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
  windows:
  setup:
  - mkdir C:\b
  - mklink /J C:\b\bazeltest_external %OUTPUT_BASE:/=\%\external
- batch_commands:
- - powershell -Command "(Get-Content WORKSPACE.bzlmod) -Replace '# android_', 'android_' | Set-Content WORKSPACE.bzlmod"
  build_flags:
  - "--config=ci-windows"
  build_targets:
@@ -258,6 +259,7 @@ tasks:
  - "//src/test/res/..."
  - "//src/test/shell/..."
  - "//src/tools/launcher/..."
+ - "//src/tools/one_version/..."
  - "//src/tools/singlejar/..."
  - "//third_party/def_parser/..."
  - "//tools/android/..."
@@ -279,8 +281,6 @@ tasks:
  - "-//src/test/java/com/google/devtools/build/lib/remote:RemoteTests"
  - "-//src/test/shell/bazel/remote/..."
  - "-//tools/python:pywrapper_test"
- # https://github.com/bazelbuild/bazel/issues/21593
- - "-//src/test/java/com/google/devtools/build/lib/bazel/repository/downloader:DownloaderTestSuite"
  include_json_profile:
  - build
  - test
@@ -290,8 +290,6 @@ tasks:
  setup:
  - mkdir C:\b
  - mklink /J C:\b\bazeltest_external %OUTPUT_BASE:/=\%\external
- batch_commands:
- - powershell -Command "(Get-Content WORKSPACE.bzlmod) -Replace '# android_', 'android_' | Set-Content WORKSPACE.bzlmod"
  build_flags:
  - "--config=ci-windows"
  - "--config=windows_arm64"
@@ -303,9 +301,6 @@ tasks:
  rbe_ubuntu2004:
  platform: ubuntu2004
  name: "RBE"
- shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  build_flags:
  - "--config=remote"
  - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
@@ -332,6 +327,7 @@ tasks:
  - "//src/main/starlark/tests/builtins_bzl/..."
  - "//src/test/..."
  - "//src/tools/execlog/..."
+ - "//src/tools/one_version/..."
  - "//src/tools/singlejar/..."
  - "//src/tools/workspacelog/..."
  - "//third_party/ijar/..."
@@ -355,13 +351,14 @@ tasks:
  - "-//src/test/py/bazel:mod_command_test"
  - "-//src/test/shell/bazel:starlark_repository_test"
  - "-//src/test/shell/bazel:verify_workspace"
+ # Disable some Android tests since we are moving Android rules out of the Bazel repo.
+ - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
  kythe_ubuntu2204:
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  # Remove _nowkt suffix because it's only available in newer protobuf releases. See b/329055020.
  # TODO(chiwang): Remove this once we have upgraded to protobuf 25+.
  - sed -i -e 's/protobuf_nowkt/protobuf/' /usr/local/kythe/BUILD

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -4,9 +4,6 @@ tasks:
  centos7:
  shards: 4
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -46,14 +43,12 @@ tasks:
  - "-//src/test/shell/bazel:bazel_coverage_sh_test"
  # Disable some Android tests since we are moving Android rules out of the Bazel repo.
  - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
  fedora39:
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -68,9 +63,6 @@ tasks:
  ubuntu2204:
  shards: 4
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -98,6 +90,7 @@ tasks:
  - "//tools/bash/..."
  # Disable some Android tests since we are moving Android rules out of the Bazel repo.
  - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
@@ -108,9 +101,6 @@ tasks:
  CC_CONFIGURE_DEBUG: 1
  name: "Clang"
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -130,9 +120,6 @@ tasks:
  ubuntu2004:
  shards: 4
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  build_flags:
@@ -160,15 +147,13 @@ tasks:
  - "//tools/bash/..."
  # Disable some Android tests since we are moving Android rules out of the Bazel repo.
  - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
  macos:
  shards: 10
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  - ln -sf $OUTPUT_BASE/external $HOME/bazeltest/external
@@ -214,9 +199,6 @@ tasks:
  macos_arm64:
  shards: 10
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  - rm -rf $HOME/bazeltest
  - mkdir $HOME/bazeltest
  - ln -sf $OUTPUT_BASE/external $HOME/bazeltest/external
@@ -248,6 +230,7 @@ tasks:
  - "-//src/tools/android/java/com/google/devtools/build/android/..."
  - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
  - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
@@ -256,8 +239,6 @@ tasks:
  setup:
  - mkdir C:\b
  - mklink /J C:\b\bazeltest_external %OUTPUT_BASE:/=\%\external
- batch_commands:
- - powershell -Command "(Get-Content WORKSPACE.bzlmod) -Replace '# android_', 'android_' | Set-Content WORKSPACE.bzlmod"
  build_flags:
  - "--config=ci-windows"
  build_targets:
@@ -313,8 +294,6 @@ tasks:
  setup:
  - mkdir C:\b
  - mklink /J C:\b\bazeltest_external %OUTPUT_BASE:/=\%\external
- batch_commands:
- - powershell -Command "(Get-Content WORKSPACE.bzlmod) -Replace '# android_', 'android_' | Set-Content WORKSPACE.bzlmod"
  build_flags:
  - "--config=ci-windows"
  - "--config=windows_arm64"
@@ -326,11 +305,6 @@ tasks:
  rbe_ubuntu2004:
  platform: ubuntu2004
  name: "RBE"
- shell_commands:
- - sed -i.bak
- -e 's/^# android_sdk_repository/android_sdk_repository/'
- -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  build_flags:
  - "--config=remote"
  - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
@@ -386,14 +360,12 @@ tasks:
  - "-//src/test/shell/bazel:bazel_sandboxing_networking_test"
  # Disable some Android tests since we are moving Android rules out of the Bazel repo.
  - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
+ - "-//src/test/shell/bazel:bazel_android_tools_test"
  include_json_profile:
  - build
  - test
  kythe_ubuntu2204:
  shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
- -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
- - rm -f WORKSPACE.bzlmod.bak
  # Remove _nowkt suffix because it's only available in newer protobuf releases. See b/329055020.
  # TODO(chiwang): Remove this once we have upgraded to protobuf 25+.
  - sed -i -e 's/protobuf_nowkt/protobuf/' /usr/local/kythe/BUILD

diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
@@ -38,11 +38,3 @@ bind(
  actual = "@bazel_tools//tools/android:always_false",
 )
 
-# To run the Android integration tests in //src/test/shell/bazel/android:all or
-# build the Android sample app in //examples/android/java/bazel:hello_world
-#
-# 1. Install an Android SDK from https://developer.android.com
-# 2. Set the $ANDROID_HOME environment variables
-# 3. Uncomment the line below
-#
-# android_sdk_repository(name = "androidsdk")