[8.8.0] Various cherry-picks to fix RBE tests

.bazelci/build_bazel_binaries.yml

@@ -31,7 +31,10 @@ platforms:
     build_flags:
       - "-c"
       - "opt"
-  ubuntu2204:
+      # https://github.com/bazelbuild/continuous-integration/issues/2353
+      - "--linkopt=-Wl,--no-fix-cortex-a53-843419"
+      - "--host_linkopt=-Wl,--no-fix-cortex-a53-843419"
+  ubuntu2404:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_nojdk"

.bazelci/postsubmit.yml

@@ -56,7 +56,7 @@ tasks:
     include_json_profile:
       - build
       - test
-  ubuntu2204:
+  ubuntu2404:
     shell_commands:
       - rm -rf $HOME/bazeltest
       - mkdir $HOME/bazeltest
@@ -282,8 +282,8 @@ tasks:
       - "//src:bazel_nojdk.exe"
     include_json_profile:
       - build
-  rbe_ubuntu2004:
-    platform: ubuntu2004
+  rbe_ubuntu2404:
+    platform: ubuntu2404
     name: "RBE"
     build_flags:
       - "--config=remote"
@@ -336,6 +336,14 @@ tasks:
       - "-//src/test/shell/bazel:verify_workspace"
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
       - "-//src/test/shell/bazel:bazel_android_tools_test"
+      # Disable tests that fail on RBE due to sandboxing/mount restrictions
+      - "-//src/test/shell/integration:sandboxing_test"
+      - "-//src/test/java/com/google/devtools/build/lib/shell:CommandUsingLinuxSandboxTest"
+      - "-//src/test/shell/bazel:bazel_spawnstats_test"
+      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
+      - "-//src/test/shell/integration:test_test"
+      - "-//src/test/tools:daemonize_test"
+      - "-//src/test/tools:linux-sandbox_test"
     include_json_profile:
       - build
       - test

.bazelci/presubmit.yml

@@ -75,7 +75,7 @@ tasks:
     include_json_profile:
       - build
       - test
-  ubuntu2204:
+  ubuntu2404:
     shards: 4
     shell_commands:
       - rm -rf $HOME/bazeltest
@@ -305,8 +305,8 @@ tasks:
       - "//src:bazel_nojdk.exe"
     include_json_profile:
       - build
-  rbe_ubuntu2004:
-    platform: ubuntu2004
+  rbe_ubuntu2404:
+    platform: ubuntu2404
     name: "RBE"
     build_flags:
       - "--config=remote"
@@ -362,6 +362,14 @@ tasks:
       - "-//src/test/shell/bazel:bazel_sandboxing_networking_test"
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
       - "-//src/test/shell/bazel:bazel_android_tools_test"
+      # Disable tests that fail on RBE due to sandboxing/mount restrictions
+      - "-//src/test/shell/integration:sandboxing_test"
+      - "-//src/test/java/com/google/devtools/build/lib/shell:CommandUsingLinuxSandboxTest"
+      - "-//src/test/shell/bazel:bazel_spawnstats_test"
+      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
+      - "-//src/test/shell/integration:test_test"
+      - "-//src/test/tools:daemonize_test"
+      - "-//src/test/tools:linux-sandbox_test"
     include_json_profile:
       - build
       - test

.bazelrc

@@ -11,17 +11,16 @@ build:remote_shared --action_env=PATH=/bin:/usr/bin:/usr/local/bin
 build:remote_shared --java_runtime_version=rbe_jdk
 build:remote_shared --tool_java_runtime_version=rbe_jdk
 
-# Configuration to build and test Bazel on RBE on Ubuntu 18.04 with Java 11
-build:ubuntu2004 --extra_toolchains=@rbe_ubuntu2004//java:all
-build:ubuntu2004 --crosstool_top=@rbe_ubuntu2004//cc:toolchain
-build:ubuntu2004 --extra_toolchains=@rbe_ubuntu2004//config:cc-toolchain
-build:ubuntu2004 --extra_execution_platforms=//:rbe_ubuntu2004_platform,//:rbe_ubuntu2004_highcpu_platform
-build:ubuntu2004 --host_platform=//:rbe_ubuntu2004_platform
-build:ubuntu2004 --platforms=//:rbe_ubuntu2004_platform
-build:ubuntu2004 --config=remote_shared
+# Configuration to build and test Bazel on RBE on Ubuntu 20.04
+common:ubuntu2404 --extra_toolchains=@rbe_ubuntu2404//java:all
+common:ubuntu2404 --extra_toolchains=@rbe_ubuntu2404//config:cc-toolchain
+common:ubuntu2404 --extra_execution_platforms=//:rbe_ubuntu2404_platform,//:rbe_ubuntu2404_highcpu_platform
+common:ubuntu2404 --host_platform=//:rbe_ubuntu2404_platform
+common:ubuntu2404 --platforms=//:rbe_ubuntu2404_platform
+common:ubuntu2404 --config=remote_shared
 
 # Alias
-build:remote --config=ubuntu2004
+common:remote --config=ubuntu2404
 
 build:macos --macos_minimum_os=10.13
 

BUILD

@@ -289,7 +289,7 @@ platform(
     ],
 )
 
-REMOTE_PLATFORMS = ("rbe_ubuntu2004",)
+REMOTE_PLATFORMS = ("rbe_ubuntu2404",)
 
 [
     platform(

MODULE.bazel

@@ -400,8 +400,8 @@ bazel_dep(name = "wabt", version = "1.0.37")
 rbe_preconfig = use_repo_rule("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
 
 rbe_preconfig(
-    name = "rbe_ubuntu2004",
-    toolchain = "ubuntu2004",
+    name = "rbe_ubuntu2404",
+    toolchain = "ubuntu2404",
 )
 
 list_source_repository = use_repo_rule("//src/test/shell/bazel:list_source_repository.bzl", "list_source_repository")

scripts/BUILD

@@ -54,6 +54,7 @@ filegroup(
         "@platforms//os:macos": [":jq_macos"],
         "@platforms//os:windows": ["@jq_windows_amd64//file"],
     }),
+    visibility = ["//src/test:__subpackages__"],
 )
 
 sh_test(

src/test/shell/bazel/BUILD

@@ -656,7 +656,13 @@ sh_test(
 sh_test(
     name = "bazel_cc_code_coverage_test",
     srcs = ["bazel_cc_code_coverage_test.sh"],
-    data = [":test-deps"],
+    data = [
+        ":test-deps",
+        "//scripts:jq",
+    ],
+    env = {
+        "JQ_RLOCATIONPATH": "$(rlocationpath //scripts:jq)",
+    },
     tags = [
         # C++ coverage is not supported on macOS yet.
         "no_macos",