Skip to content

Commit

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

Fixed via bazelbuild/continuous-integration@338db4a

*** Original change description ***

Temporarily disable //src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest.

See bazelbuild#8365.

RELNOTES: None

Closes bazelbuild#8366.

PiperOrigin-RevId: 248880855
  • Loading branch information
philwo authored and irengrig committed Jun 18, 2019
1 parent 7f6d588 commit 649dfcc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
14 changes: 0 additions & 14 deletions .bazelci/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ platforms:
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/buildjar/..."
- "-//src/java_tools/import_deps_checker/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
Expand All @@ -52,8 +50,6 @@ platforms:
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/buildjar/..."
- "-//src/java_tools/import_deps_checker/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
ubuntu1804:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
Expand Down Expand Up @@ -83,8 +79,6 @@ platforms:
- "-//src/test/shell/bazel:embedded_tools_deps_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
ubuntu1804_javabase9:
platform: ubuntu1804_nojava
name: ":java: OpenJDK 9 Javabase"
Expand Down Expand Up @@ -151,8 +145,6 @@ platforms:
- "-//src/test/shell/integration:test_test"
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
ubuntu1804_javabase10:
platform: ubuntu1804_nojava
name: ":java: OpenJDK 10 Javabase"
Expand Down Expand Up @@ -219,8 +211,6 @@ platforms:
- "-//src/test/shell/integration:test_test"
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
macos:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
Expand Down Expand Up @@ -255,8 +245,6 @@ platforms:
- "-//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"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
windows:
batch_commands:
- powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE"
Expand All @@ -280,8 +268,6 @@ platforms:
- "//src:all_windows_tests"
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
rbe_ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
Expand Down
14 changes: 0 additions & 14 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ platforms:
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/buildjar/..."
- "-//src/java_tools/import_deps_checker/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
Expand Down Expand Up @@ -60,8 +58,6 @@ platforms:
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/buildjar/..."
- "-//src/java_tools/import_deps_checker/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
ubuntu1804:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
Expand Down Expand Up @@ -95,8 +91,6 @@ platforms:
- "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
ubuntu1804_javabase9:
platform: ubuntu1804_nojava
name: ":java: OpenJDK 9 Javabase"
Expand Down Expand Up @@ -163,8 +157,6 @@ platforms:
- "-//src/test/shell/integration:output_filter_test"
- "-//src/test/shell/integration:stub_finds_runfiles_test"
- "-//src/test/shell/integration:test_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
ubuntu1804_javabase10:
platform: ubuntu1804_nojava
name: ":java: OpenJDK 10 Javabase"
Expand Down Expand Up @@ -231,8 +223,6 @@ platforms:
- "-//src/test/shell/integration:output_filter_test"
- "-//src/test/shell/integration:stub_finds_runfiles_test"
- "-//src/test/shell/integration:test_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
macos:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
Expand Down Expand Up @@ -282,8 +272,6 @@ platforms:
- "-//src/test/shell/bazel/android:aar_integration_test"
- "-//src/test/shell/bazel/android:android_integration_test"
- "-//src/test/shell/integration:minimal_jdk_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
windows:
batch_commands:
- powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE"
Expand All @@ -305,8 +293,6 @@ platforms:
test_targets:
- "--"
- "//src:all_windows_tests"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8365
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest"
rbe_ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
Expand Down

0 comments on commit 649dfcc

Please sign in to comment.