Clean-up our presubmit.yml and postsubmit.yml.
A couple of tests were disabled that can be re-enabled now. Also, auto-format the YAML with VS Code for consistent style.
RELNOTES: None.
PiperOrigin-RevId: 291703274
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index d8684f2..711e803 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -1,5 +1,5 @@
---
-platforms:
+tasks:
centos7:
shards: 4
shell_commands:
@@ -22,19 +22,13 @@
- "//tools/android/..."
- "//tools/aquery_differ/..."
- "//tools/python/..."
- # Disable Slow Tests
- - "-//src/test/shell/bazel:bazel_determinism_test"
- # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- - "-//src/test/shell/bazel/android:android_ndk_integration_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/buildjar/..."
- "-//src/java_tools/import_deps_checker/..."
- # TODO(philwo): Re-enable after #8708 is fixed.
+ # These tests are not compatible with the gcov version of CentOS 7.
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
- "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc"
- "-//src/test/shell/bazel:bazel_coverage_sh_test"
- # TODO(katre): Re-enable after 0.29.0: https://github.com/bazelbuild/bazel/issues/9148
- - "-//src/tools/singlejar:combiners_test"
ubuntu1604:
shards: 4
shell_commands:
@@ -57,15 +51,9 @@
- "//tools/android/..."
- "//tools/aquery_differ/..."
- "//tools/python/..."
- # Disable Slow Tests
- - "-//src/test/shell/bazel:bazel_determinism_test"
- # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- - "-//src/test/shell/bazel/android:android_ndk_integration_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/buildjar/..."
- "-//src/java_tools/import_deps_checker/..."
- # TODO(katre): Re-enable after 0.29.0: https://github.com/bazelbuild/bazel/issues/9148
- - "-//src/tools/singlejar:combiners_test"
ubuntu1804:
shards: 4
shell_commands:
@@ -90,16 +78,8 @@
- "//tools/android/..."
- "//tools/aquery_differ/..."
- "//tools/python/..."
- # Disable Slow Tests
- - "-//src/test/shell/bazel:bazel_determinism_test"
- # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- - "-//src/test/shell/bazel/android:android_ndk_integration_test"
- # Some prebuilt jars don't run with Java 11
- - "-//src/test/shell/bazel:external_integration_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
- # TODO(katre): Re-enable after 0.29.0: https://github.com/bazelbuild/bazel/issues/9148
- - "-//src/tools/singlejar:combiners_test"
ubuntu1804_clang:
platform: ubuntu1804
environment:
@@ -125,8 +105,6 @@
- rm -f WORKSPACE.bak
build_flags:
- "--apple_platform_type=macos"
- # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed.
- - "--noincompatible_strict_action_env"
build_targets:
- "//src:bazel"
- "//src:bazel_jdk_minimal"
@@ -134,8 +112,6 @@
- "--test_timeout=1200"
# Configure and enable tests that require access to the network.
- "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
- # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed.
- - "--noincompatible_strict_action_env"
test_targets:
- "//scripts/..."
- "//src/test/..."
@@ -147,31 +123,13 @@
- "//tools/aquery_differ/..."
- "//tools/osx/crosstool/..."
- "//tools/python/..."
- # C++ coverage is not supported on macOS yet.
+ # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+ - "-//src/java_tools/buildjar/..."
+ - "-//src/java_tools/import_deps_checker/..."
+ # C++ coverage is not supported on macOS yet.
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
- # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- - "-//src/test/shell/bazel/android:android_ndk_integration_test"
- # The below tests have been disabled because they are too slow on macOS.
- # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4684
- - "-//src/test/shell/bazel:bazel_determinism_test"
- - "-//src/test/shell/bazel:bazel_java_test"
- - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_released"
- - "-//src/test/shell/bazel:bazel_java_test_jdk9_toolchain_head"
- - "-//src/test/shell/bazel:bazel_java_test_jdk10_toolchain_head"
- - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
- - "-//src/test/shell/bazel/remote:remote_execution_test"
- - "-//src/test/shell/bazel/remote:remote_execution_http_test"
- - "-//src/test/shell/bazel:skylark_git_repository_test"
- - "-//src/test/shell/bazel:external_path_test"
- - "-//src/test/py/bazel:runfiles_test"
- - "-//src/test/shell/bazel:git_repository_test"
- - "-//src/test/shell/bazel/android:aar_integration_test"
- - "-//src/test/shell/bazel/android:android_integration_test"
- - "-//src/test/shell/integration:minimal_jdk_test"
- # Docker sandboxing needs Docker installed
+ # Docker sandboxing needs Docker installed
- "-//src/test/shell/bazel:bazel_docker_sandboxing_test"
- # TODO(katre): Re-enable after 0.29.0: https://github.com/bazelbuild/bazel/issues/9148
- - "-//src/tools/singlejar:combiners_test"
windows:
shards: 4
batch_commands:
@@ -179,8 +137,6 @@
build_flags:
- "--copt=-w"
- "--host_copt=-w"
- # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed.
- - "--noincompatible_strict_action_env"
build_targets:
- "//src:bazel.exe"
- "//src:bazel_jdk_minimal"
@@ -189,53 +145,47 @@
- "--host_copt=-w"
- "--test_env=JAVA_HOME"
- "--test_timeout=1200"
- # Remove when https://github.com/bazelbuild/bazel/issues/7026 is fixed.
- - "--noincompatible_strict_action_env"
test_targets:
- "//src:all_windows_tests"
- # TODO(katre): Re-enable after 0.29.0: https://github.com/bazelbuild/bazel/issues/9148
- - "-//src/tools/singlejar:combiners_test"
rbe_ubuntu1604:
shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE
- - rm -f WORKSPACE.bak
+ - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
+ android_ndk_repository/android_ndk_repository/' WORKSPACE
+ - rm -f WORKSPACE.bak
build_flags:
- - "--config=ubuntu1604_java8"
- - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
- - "--jobs=200"
- - "--experimental_remote_download_outputs=minimal"
- - "--experimental_inmemory_jdeps_files"
- - "--experimental_inmemory_dotd_files"
+ - "--config=ubuntu1604_java8"
+ - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
+ - "--jobs=200"
+ - "--experimental_remote_download_outputs=minimal"
+ - "--experimental_inmemory_jdeps_files"
+ - "--experimental_inmemory_dotd_files"
build_targets:
- "//src:bazel"
- "//src:bazel_jdk_minimal"
test_flags:
- - "--config=ubuntu1604_java8"
- - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
- - "--jobs=200"
- - "--experimental_remote_download_outputs=minimal"
- - "--experimental_inmemory_jdeps_files"
- - "--experimental_inmemory_dotd_files"
+ - "--config=ubuntu1604_java8"
+ - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
+ - "--jobs=200"
+ - "--experimental_remote_download_outputs=minimal"
+ - "--experimental_inmemory_jdeps_files"
+ - "--experimental_inmemory_dotd_files"
test_targets:
- - "--"
- - "//scripts/..."
- - "//src/java_tools/..."
- - "//src/test/..."
- - "//src/tools/execlog/..."
- - "//src/tools/singlejar/..."
- - "//src/tools/workspacelog/..."
- - "//third_party/ijar/..."
- - "//tools/aquery_differ/..."
- - "//tools/python/..."
- - "//tools/android/..."
- # See https://github.com/bazelbuild/bazel/issues/8033
- - "-//src/tools/singlejar:output_jar_simple_test"
- - "-//src/test/shell/bazel:external_integration_test"
- - "-//src/test/shell/bazel:bazel_repository_cache_test"
- - "-//src/test/shell/integration:java_integration_test"
- - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
- # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
- - "-//src/java_tools/buildjar/..."
- - "-//src/java_tools/import_deps_checker/..."
-
+ - "//scripts/..."
+ - "//src/java_tools/..."
+ - "//src/test/..."
+ - "//src/tools/execlog/..."
+ - "//src/tools/singlejar/..."
+ - "//src/tools/workspacelog/..."
+ - "//third_party/ijar/..."
+ - "//tools/aquery_differ/..."
+ - "//tools/python/..."
+ - "//tools/android/..."
+ # See https://github.com/bazelbuild/bazel/issues/8033
+ - "-//src/tools/singlejar:output_jar_simple_test"
+ - "-//src/test/shell/bazel:external_integration_test"
+ - "-//src/test/shell/bazel:bazel_repository_cache_test"
+ - "-//src/test/shell/integration:java_integration_test"
+ - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
+ # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
+ - "-//src/java_tools/buildjar/..."
+ - "-//src/java_tools/import_deps_checker/..."
