Automated rollback of commit 1eed4c1ed1d9d957625e748f1ed6bef3d4088f02.
*** Reason for rollback ***
Fixed via https://github.com/bazelbuild/continuous-integration/commit/338db4a39c0a6a0e04f17eb0cd9f1b8eb57ec34c
*** Original change description ***
Temporarily disable //src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:WorkspaceBlackBoxTest.
See #8365.
RELNOTES: None
Closes #8366.
PiperOrigin-RevId: 248880855
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index 094f10a..6924be5 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -25,8 +25,6 @@
# 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/^#
@@ -52,8 +50,6 @@
# 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/^#
@@ -83,8 +79,6 @@
- "-//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"
@@ -151,8 +145,6 @@
- "-//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"
@@ -219,8 +211,6 @@
- "-//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/^#
@@ -255,8 +245,6 @@
- "-//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"
@@ -280,8 +268,6 @@
- "//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/'
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 530c6ce..87c974e 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -29,8 +29,6 @@
# 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/^#
@@ -60,8 +58,6 @@
# 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/^#
@@ -95,8 +91,6 @@
- "-//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"
@@ -163,8 +157,6 @@
- "-//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"
@@ -231,8 +223,6 @@
- "-//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/^#
@@ -282,8 +272,6 @@
- "-//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"
@@ -305,8 +293,6 @@
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/'
