Skip to content

Commit

Permalink
Automated rollback of commit 86c202f.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Bazel 3.4.1 is released and fixes the issue.

*** Original change description ***

Disable tests on RBE in Bazel's presubmit and postsubmit.

Bazel 3.4.0 broke something and now rbe_autoconfig fails somewhere inside Docker where it tries to start Bazel: https://buildkite.com/bazel/google-bazel-presubmit/builds/36688#262e09df-19ea-47cc-96bf-3c5a4e2d7352

This CL should be rolled back as soon as we figured out how to fix this.

The breakage is tracked in: #11756

RELNOTES: None.
PiperOrigin-RevId: 321120981
  • Loading branch information
meisterT authored and copybara-github committed Jul 14, 2020
1 parent c3ea5a1 commit 8953b66
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 0 deletions.
12 changes: 12 additions & 0 deletions .bazelci/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,3 +205,15 @@ tasks:
include_json_profile:
- build
- test
rbe_ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
-e 's/^# android_ndk_repository/android_ndk_repository/'
-e 's/^# rbe_autoconfig/rbe_autoconfig/'
-e 's/^# load("@bazel_toolchains/load("@bazel_toolchains/' WORKSPACE
- rm -f WORKSPACE.bak
build_targets:
- "//src:bazel"
- "//src:bazel_jdk_minimal"
include_json_profile:
- build
42 changes: 42 additions & 0 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,45 @@ tasks:
- "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
test_targets:
- "//src:all_windows_tests"
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
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"
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"
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/..."

0 comments on commit 8953b66

Please sign in to comment.