From 1d5c44551dad740ce05d54722e5de3341e42fa9d Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 25 Jun 2019 10:07:01 +0200
Subject: [PATCH] build: use checked-in configuration from bazel-toolchains
 (#31251)

No longer uses docker in order to pull down the toolchain configs
for remote build execution. We don't need to make docker a prerequisite
for working on the Angular repository since we can leverage the checked-in
toolchain configurations from the `@bazel-toolchains` repository.

PR Close #31251
---
 .circleci/config.yml       |  8 --------
 WORKSPACE                  | 17 ++++++++++-------
 packages/bazel/package.bzl |  8 +++-----
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c5d376da76..175ad78e81 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -190,8 +190,6 @@ jobs:
       - *attach_workspace
       - *init_environment
       - *setup_circleci_bazel_config
-      # Enable remote/sibling docker which is needed by auto-selection of toolchain configs for RBE.
-      - setup_remote_docker
       # Setup remote execution and run RBE-compatible tests.
       - *setup_bazel_remote_execution
       - run: yarn bazel test //... --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only
@@ -211,8 +209,6 @@ jobs:
       - *attach_workspace
       - *init_environment
       - *setup_circleci_bazel_config
-      # Enable remote/sibling docker which is needed by auto-selection of toolchain configs for RBE.
-      - setup_remote_docker
       - *setup_bazel_remote_execution
 
         # We need to explicitly specify the --symlink_prefix option because otherwise we would
@@ -443,8 +439,6 @@ jobs:
       - *attach_workspace
       - *init_environment
       - *setup_circleci_bazel_config
-      # Enable remote/sibling docker which is needed by auto-selection of toolchain configs for RBE.
-      - setup_remote_docker
       - *setup_bazel_remote_execution
 
       - run: scripts/build-packages-dist.sh
@@ -471,8 +465,6 @@ jobs:
       - *attach_workspace
       - *init_environment
       - *setup_circleci_bazel_config
-      # Enable remote/sibling docker which is needed by auto-selection of toolchain configs for RBE.
-      - setup_remote_docker
       - *setup_bazel_remote_execution
 
       - run: scripts/build-ivy-npm-packages.sh
diff --git a/WORKSPACE b/WORKSPACE
index 70d51114f9..cec3c44a63 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -124,17 +124,20 @@ load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
 
 rbe_autoconfig(
     name = "rbe_ubuntu1604_angular",
-    # The sha256 of marketplace.gcr.io/google/rbe-ubuntu16-04 container that is
-    # used by rbe_autoconfig() to pair toolchain configs in the @bazel_toolchains repo.
-    base_container_digest = "sha256:677c1317f14c6fd5eba2fd8ec645bfdc5119f64b3e5e944e13c89e0525cc8ad1",
+    # Need to specify a base container digest in order to ensure that we can use the checked-in
+    # platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
+    # need to pull the image and run it in order determine the toolchain configuration. See:
+    # https://github.com/bazelbuild/bazel-toolchains/blob/0.27.0/configs/ubuntu16_04_clang/versions.bzl
+    base_container_digest = "sha256:94d7d8552902d228c32c8c148cc13f0effc2b4837757a6e95b73fdc5c5e4b07b",
     # Note that if you change the `digest`, you might also need to update the
     # `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
     # and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
-    # the same Clang and JDK installed.
-    # Clang is needed because of the dependency on @com_google_protobuf.
-    # Java is needed for the Bazel's test executor Java tool.
-    digest = "sha256:74a8e9dca4781d5f277a7bd8e7ea7ed0f5906c79c9cd996205b6d32f090c62f3",
+    # the same Clang and JDK installed. Clang is needed because of the dependency on
+    # @com_google_protobuf. Java is needed for the Bazel's test executor Java tool.
+    digest = "sha256:76e2e4a894f9ffbea0a0cb2fbde741b5d223d40f265dbb9bca78655430173990",
     env = clang_env(),
     registry = "marketplace.gcr.io",
+    # We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need
+    # a specific Linux kernel that comes with "libx11" in order to run headless browser tests.
     repository = "google/rbe-ubuntu16-04-webtest",
 )
diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl
index 2cf12c1d43..f5e40fb711 100644
--- a/packages/bazel/package.bzl
+++ b/packages/bazel/package.bzl
@@ -28,11 +28,9 @@ def rules_angular_dev_dependencies():
     _maybe(
         http_archive,
         name = "bazel_toolchains",
-        sha256 = "142bcbd8cb751ce1193a1d7fef4e328493cd0a69cc0555183ad237f81418ba40",
-        strip_prefix = "bazel-toolchains-628224f6cf48e81116d0ee0bf65424eaa630d5b3",
-        urls = [
-            "https://github.com/xingao267/bazel-toolchains/archive/628224f6cf48e81116d0ee0bf65424eaa630d5b3.tar.gz",
-        ],
+        sha256 = "4598bf5a8b4f5ced82c782899438a7ba695165d47b3bf783ce774e89a8c6e617",
+        strip_prefix = "bazel-toolchains-0.27.0",
+        url = "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.0.tar.gz",
     )
 
     #############################################