rbe-configs: add more toolchains (#2617)

rbe-configs/cpp_env/ubuntu2404.json

diff --git a/rbe-configs/cpp_env/ubuntu2404.json b/rbe-configs/cpp_env/ubuntu2404.json
new file mode 100644
index 0000000..4c89777
--- /dev/null
+++ b/rbe-configs/cpp_env/ubuntu2404.json
@@ -0,0 +1,11 @@
+{
+  "ABI_LIBC_VERSION": "glibc_2.39",
+  "ABI_VERSION": "gcc",
+  "BAZEL_COMPILER": "gcc",
+  "BAZEL_HOST_SYSTEM": "i686-unknown-linux-gnu",
+  "BAZEL_TARGET_CPU": "k8",
+  "BAZEL_TARGET_LIBC": "glibc_2.39",
+  "BAZEL_TARGET_SYSTEM": "x86_64-unknown-linux-gnu",
+  "CC": "gcc",
+  "CC_TOOLCHAIN_NAME": "linux_gnu_x86"
+}

rbe-configs/data.py

diff --git a/rbe-configs/data.py b/rbe-configs/data.py
index cb31ad0..717f0b9 100644
--- a/rbe-configs/data.py
+++ b/rbe-configs/data.py
@@ -1,12 +1,50 @@
 configs = [
   {
-    "bazel_version": "8.0.1",
+    "bazel_version": "9.1.0",
     "containers": [
       {
+          'toolchain_name': 'ubuntu2404',
+          'cpp_env_json': 'cpp_env/ubuntu2404.json'
+      }
+    ]
+  },
+  {
+    "bazel_version": "9.0.0",
+    "containers": [
+      {
+          'toolchain_name': 'ubuntu1804-bazel-java11',
+          'cpp_env_json': 'cpp_env/ubuntu1804.json'
+      },
+      {
           'toolchain_name': 'ubuntu2004',
           'cpp_env_json': 'cpp_env/ubuntu2004.json'
       },
       {
+        'toolchain_name': 'ubuntu2004-bazel-java11',
+        'cpp_env_json': 'cpp_env/ubuntu2004.json'
+      },
+      {
+          'toolchain_name': 'ubuntu2204',
+          'cpp_env_json': 'cpp_env/ubuntu2004.json'
+      }
+    ]
+  },
+  {
+    "bazel_version": "8.0.1",
+    "containers": [
+      {
+          'toolchain_name': 'ubuntu1804-bazel-java11',
+          'cpp_env_json': 'cpp_env/ubuntu1804.json'
+      },
+      {
+          'toolchain_name': 'ubuntu2004',
+          'cpp_env_json': 'cpp_env/ubuntu2004.json'
+      },
+      {
+        'toolchain_name': 'ubuntu2004-bazel-java11',
+        'cpp_env_json': 'cpp_env/ubuntu2004.json'
+      },
+      {
           'toolchain_name': 'ubuntu2204',
           'cpp_env_json': 'cpp_env/ubuntu2004.json'
       }

rbe-configs/generate.py

diff --git a/rbe-configs/generate.py b/rbe-configs/generate.py
index d1b3773..0c964b5 100755
--- a/rbe-configs/generate.py
+++ b/rbe-configs/generate.py
@@ -79,7 +79,8 @@
 def upload_manifest(output_root: str, upload_root: str):
   subprocess.run(
       [
-          'gsutil',
+          'gcloud',
+          'storage',
           'cp',
           '{}/manifest.json'.format(output_root),
           '{}/manifest.json'.format(upload_root),
@@ -96,7 +97,8 @@
 
   subprocess.run(
       [
-          'gsutil',
+          'gcloud',
+          'storage',
           'cp',
           get_output_tarball(output_dir),
           get_output_tarball(upload_dir),
@@ -106,7 +108,8 @@
 
   subprocess.run(
       [
-          'gsutil',
+          'gcloud',
+          'storage',
           'cp',
           get_output_manifest(output_dir),
           get_output_manifest(upload_dir),