Remove test_bootstrap_with_cc_rules_using_platforms test.
This test was added before Bazel CI supported testing projects with the pending incompatible flags. It makes sure that Bazel can still build Bazel even when --incompatible_enable_cc_toolchain_resolution is set. However, this is now provided by the "Bazelisk + Incompatible Flags" pipeline, which tests this during a nightly run.
Because bootstrapping Bazel is very resource intensive, this test has recently been the slowest test on our Mac CI. The Mac CI is already the slowest platform due to its hardware being slower than the Linux machines. Thus, removing this test should speed up the pre- and postsubmit pipelines.
RELNOTES: None.
PiperOrigin-RevId: 294214372
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 9a53cd9..2948698 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -1012,7 +1012,6 @@
"@bazel_tools//tools/bash/runfiles",
],
exec_compatible_with = ["//:highcpu_machine"],
- shard_count = 2,
tags = ["block-network"],
)
diff --git a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh
index 401221a..338ee03 100755
--- a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh
+++ b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh
@@ -69,17 +69,7 @@
declare -r EMBEDDED_JDK=""
fi
-function test_bootstrap() {
- execute_bootstrap "--host_javabase=@local_jdk//:jdk"
-}
-
-# TODO(#7260): Remove this test once this flag is flipped
-function test_bootstrap_with_cc_rules_using_platforms() {
- execute_bootstrap "--host_javabase=@local_jdk//:jdk "\
- "--incompatible_enable_cc_toolchain_resolution"
-}
-
-function execute_bootstrap() {
+function test_bootstrap() {
cd "$(mktemp -d ${TEST_TMPDIR}/bazelbootstrap.XXXXXXXX)"
export SOURCE_DATE_EPOCH=1501234567
unzip -q "${DISTFILE}"
@@ -90,7 +80,7 @@
fi
JAVABASE=$(echo reduced*)
- env EXTRA_BAZEL_ARGS="${1}" ./compile.sh \
+ env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" ./compile.sh \
|| fail "Expected to be able to bootstrap bazel"
./output/bazel \
--server_javabase=$JAVABASE --host_jvm_args=--add-opens=java.base/java.nio=ALL-UNNAMED \
