Use rbe host config from build-tools

mauna-ai · Mar 24, 2019 · f46b83f · f46b83f
1 parent f229db3
commit f46b83f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -4,9 +4,9 @@ build:rbe --remote_cache=remotebuildexecution.googleapis.com
 build:rbe --remote_executor=remotebuildexecution.googleapis.com
 build:rbe --bes_backend="buildeventservice.googleapis.com"
 build:rbe --bes_results_url="https://source.cloud.google.com/results/invocations/"
-build:rbe --host_platform=//:rbe-platform
-build:rbe --platforms=//:rbe-platform
-build:rbe --extra_execution_platforms=//:rbe-platform
+build:rbe --host_platform=@graknlabs_build_tools//:rbe-ubuntu1604-network-standard
+build:rbe --platforms=@graknlabs_build_tools//:rbe-ubuntu1604-network-standard
+build:rbe --extra_execution_platforms=@graknlabs_build_tools//:rbe-ubuntu1604-network-standard
 build:rbe --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.1:jdk8
 build:rbe --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.1:jdk8
 build:rbe --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8

diff --git a/BUILD b/BUILD
@@ -131,18 +131,3 @@ container_push(
     registry = "index.docker.io",
     repository = "graknlabs/grakn-core",
 )
-
-# When a Bazel build or test is executed with RBE, it will be executed using the following platform.
-# The platform is based on the standard rbe_ubuntu1604 from @bazel_toolchains,
-# but with an additional setting dockerNetwork = standard because our tests need network access
-platform(
-    name = "rbe-platform",
-    parents = ["@bazel_toolchains//configs/ubuntu16_04_clang/1.1:rbe_ubuntu1604"],
-    remote_execution_properties = """
-        {PARENT_REMOTE_EXECUTION_PROPERTIES}
-        properties: {
-          name: "dockerNetwork"
-          value: "standard"
-        }
-        """,
-)
diff --git a/dependencies/graknlabs/dependencies.bzl b/dependencies/graknlabs/dependencies.bzl
@@ -22,15 +22,14 @@ def graknlabs_graql():
      git_repository(
          name = "graknlabs_graql",
          remote = "https://github.com/graknlabs/graql",
-         commit = "961536adf848d646590b993a87848da1826e4fab",
+         commit = "bc8f56dee66b7361dc66ac85e47e1ff9745c9c3e",
      )
 
 def graknlabs_client_java():
-    # TODO: update to graknlabs/client-java before merging the PR
      git_repository(
          name = "graknlabs_client_java",
          remote = "https://github.com/graknlabs/client-java",
-         commit = "32015cc11e24215e12854eaa098d3fbce97ecbe9",
+         commit = "d9091e05e61a592752da5bc487af5ed2ba518695",
      )
 
 def graknlabs_build_tools():