From 553c2bc904865fa94a9e077ac34d7d7147fa928d Mon Sep 17 00:00:00 2001 From: Chi Wang Date: Wed, 18 Oct 2023 06:00:48 -0700 Subject: [PATCH] Upgrade to rbe_ubuntu2004 Working towards https://github.com/bazelbuild/continuous-integration/issues/1757. Closes #19866. PiperOrigin-RevId: 574451509 Change-Id: I00bc491365a69558038293ad2035c5133da2059a --- .bazelci/postsubmit.yml | 8 ++++---- .bazelci/presubmit.yml | 10 +++++----- .bazelrc | 16 ++++++++-------- BUILD | 2 +- MODULE.bazel | 2 +- MODULE.bazel.lock | 12 ++++++------ rbe_extension.bzl | 4 ++-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml index 625b298aba9e7b..0ff4c51bcb282a 100644 --- a/.bazelci/postsubmit.yml +++ b/.bazelci/postsubmit.yml @@ -348,8 +348,8 @@ tasks: - "//src:bazel_nojdk.exe" include_json_profile: - build - rbe_ubuntu1804: - platform: ubuntu1804 + rbe_ubuntu2004: + platform: ubuntu2004 name: "RBE" shell_commands: - sed -i.bak @@ -357,7 +357,7 @@ tasks: -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 index 0bb8fe2c082aa4..7d24c739659aca 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -409,8 +409,8 @@ tasks: - "//src:bazel_nojdk.exe" include_json_profile: - build - rbe_ubuntu1804: - platform: ubuntu1804 + rbe_ubuntu2004: + platform: ubuntu2004 name: "RBE" shell_commands: - sed -i.bak @@ -418,7 +418,7 @@ tasks: -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 index 041ac119815df1..9fbb5ece42fe72 100644 --- 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 index 033a1e44b73b74..56b79c87eac07d 100644 --- 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 index 2acffcdd3cb849..e39f58d2909469 100644 --- 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 index 4906c0f2deb065..dee726962f0a5a 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "e5fae0af8e1b7f0db863044df3045425f7eb9a7d08961ac90217a81780da6baa", + "moduleFileHash": "50de843d4bf36021313d6db4e8f2656ed1d2aadbcc3d26791537d366111eb6be", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -513,7 +513,7 @@ "column": 31 }, "imports": { - "rbe_ubuntu1804_java11": "rbe_ubuntu1804_java11" + "rbe_ubuntu2004_java11": "rbe_ubuntu2004_java11" }, "devImports": [], "tags": [], @@ -2385,16 +2385,16 @@ }, "//:rbe_extension.bzl%bazel_rbe_deps": { "general": { - "bzlTransitiveDigest": "iuUIrESHd0zN5HwjvXaCrwa9G/fKaeabyyrrtQVmBvA=", + "bzlTransitiveDigest": "oNMQ9KtzGcqNHdpe8zMO3lRAVIKWWDmz8n5SMubtIIc=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { - "rbe_ubuntu1804_java11": { + "rbe_ubuntu2004_java11": { "bzlFile": "@@_main~bazel_test_deps~bazelci_rules//:rbe_repo.bzl", "ruleClassName": "rbe_preconfig", "attributes": { - "name": "_main~bazel_rbe_deps~rbe_ubuntu1804_java11", - "toolchain": "ubuntu1804-bazel-java11" + "name": "_main~bazel_rbe_deps~rbe_ubuntu2004_java11", + "toolchain": "ubuntu2004-bazel-java11" } } } diff --git a/rbe_extension.bzl b/rbe_extension.bzl index 8c4ba715387140..90dea5fc73218f 100644 --- 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)