[7.0.0] Upgrade to rbe_ubuntu2004 (bazelbuild#19868)

Working towards bazelbuild/continuous-integration#1757. Closes bazelbuild#19866. Commit bazelbuild@553c2bc PiperOrigin-RevId: 574451509 Change-Id: I00bc491365a69558038293ad2035c5133da2059a Co-authored-by: Chi Wang <[email protected]>
comius · Oct 18, 2023 · 991aeb7 · 991aeb7
1 parent e977195
commit 991aeb7
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
@@ -348,16 +348,16 @@ tasks:
       - "//src:bazel_nojdk.exe"
     include_json_profile:
       - build
-  rbe_ubuntu1804:
-    platform: ubuntu1804
+  rbe_ubuntu2004:
+    platform: ubuntu2004
     name: "RBE"
     shell_commands:
       - sed -i.bak
         -e 's/^# android_sdk_repository/android_sdk_repository/'
         -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
       - rm -f WORKSPACE.bzlmod.bak
     build_flags:
-      - "--config=ubuntu1804_java11"
+      - "--config=ubuntu2004_java11"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
       - "--experimental_remote_cache_async"
@@ -368,7 +368,7 @@ tasks:
       - "//src:bazel_jdk_minimal"
       - "//src/main/java/..."
     test_flags:
-      - "--config=ubuntu1804_java11"
+      - "--config=ubuntu2004_java11"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
       - "--experimental_remote_cache_async"

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -409,16 +409,16 @@ tasks:
       - "//src:bazel_nojdk.exe"
     include_json_profile:
       - build
-  rbe_ubuntu1804:
-    platform: ubuntu1804
+  rbe_ubuntu2004:
+    platform: ubuntu2004
     name: "RBE"
     shell_commands:
       - sed -i.bak
         -e 's/^# android_sdk_repository/android_sdk_repository/'
         -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
       - rm -f WORKSPACE.bzlmod.bak
     build_flags:
-      - "--config=ubuntu1804_java11"
+      - "--config=ubuntu2004_java11"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
       - "--experimental_remote_cache_async"
@@ -429,7 +429,7 @@ tasks:
       - "//src:bazel_jdk_minimal"
       - "//src/main/java/..."
     test_flags:
-      - "--config=ubuntu1804_java11"
+      - "--config=ubuntu2004_java11"
       - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
       - "--jobs=200"
       - "--experimental_remote_cache_async"
@@ -465,7 +465,7 @@ tasks:
       - "-//src/test/py/bazel:bazel_yanked_versions_test"
       - "-//src/test/py/bazel:bzlmod_query_test"
       - "-//src/test/shell/bazel:verify_workspace"
-      # Flaky on rbe_ubuntu1804
+      # Flaky on rbe_ubuntu2004
       # https://github.com/bazelbuild/continuous-integration/issues/1631
       - "-//src/test/shell/bazel:bazel_sandboxing_networking_test"
       # https://github.com/bazelbuild/bazel/issues/18776

diff --git a/.bazelrc b/.bazelrc
@@ -14,16 +14,16 @@ build:remote_shared --tool_java_runtime_version=rbe_jdk
 build:remote_shared --noexperimental_check_desugar_deps
 
 # Configuration to build and test Bazel on RBE on Ubuntu 18.04 with Java 11
-build:ubuntu1804_java11 --extra_toolchains=@rbe_ubuntu1804_java11//java:all
-build:ubuntu1804_java11 --crosstool_top=@rbe_ubuntu1804_java11//cc:toolchain
-build:ubuntu1804_java11 --extra_toolchains=@rbe_ubuntu1804_java11//config:cc-toolchain
-build:ubuntu1804_java11 --extra_execution_platforms=//:rbe_ubuntu1804_java11_platform,//:rbe_ubuntu1804_java11_highcpu_platform
-build:ubuntu1804_java11 --host_platform=//:rbe_ubuntu1804_java11_platform
-build:ubuntu1804_java11 --platforms=//:rbe_ubuntu1804_java11_platform
-build:ubuntu1804_java11 --config=remote_shared
+build:ubuntu2004_java11 --extra_toolchains=@rbe_ubuntu2004_java11//java:all
+build:ubuntu2004_java11 --crosstool_top=@rbe_ubuntu2004_java11//cc:toolchain
+build:ubuntu2004_java11 --extra_toolchains=@rbe_ubuntu2004_java11//config:cc-toolchain
+build:ubuntu2004_java11 --extra_execution_platforms=//:rbe_ubuntu2004_java11_platform,//:rbe_ubuntu2004_java11_highcpu_platform
+build:ubuntu2004_java11 --host_platform=//:rbe_ubuntu2004_java11_platform
+build:ubuntu2004_java11 --platforms=//:rbe_ubuntu2004_java11_platform
+build:ubuntu2004_java11 --config=remote_shared
 
 # Alias
-build:remote --config=ubuntu1804_java11
+build:remote --config=ubuntu2004_java11
 
 build:macos --macos_minimum_os=10.11
 

diff --git a/BUILD b/BUILD
@@ -263,7 +263,7 @@ platform(
     ],
 )
 
-REMOTE_PLATFORMS = ("rbe_ubuntu1804_java11",)
+REMOTE_PLATFORMS = ("rbe_ubuntu2004_java11",)
 
 [
     platform(

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -292,7 +292,7 @@ use_repo(
 )
 
 bazel_rbe_deps = use_extension("//:rbe_extension.bzl", "bazel_rbe_deps")
-use_repo(bazel_rbe_deps, "rbe_ubuntu1804_java11")
+use_repo(bazel_rbe_deps, "rbe_ubuntu2004_java11")
 
 remote_coverage_tools_extension = use_extension("//tools/test:extensions.bzl", "remote_coverage_tools_extension")
 use_repo(remote_coverage_tools_extension, "remote_coverage_tools")

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/rbe_extension.bzl b/rbe_extension.bzl
@@ -20,8 +20,8 @@ load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig")
 
 def _bazel_rbe_deps(_ctx):
     rbe_preconfig(
-        name = "rbe_ubuntu1804_java11",
-        toolchain = "ubuntu1804-bazel-java11",
+        name = "rbe_ubuntu2004_java11",
+        toolchain = "ubuntu2004-bazel-java11",
     )
 
 bazel_rbe_deps = module_extension(implementation = _bazel_rbe_deps)
-Original file line number
+Diff line change
@@ Expand Up / @@ -263,7 +263,7 @@ platform( @@
         ],
     )
-    REMOTE_PLATFORMS = ("rbe_ubuntu1804_java11",)
+    REMOTE_PLATFORMS = ("rbe_ubuntu2004_java11",)
     [
         platform(
@@ Expand Down @@