From e45308610cd5764c8b34fd69dcb080df7b7a06ca Mon Sep 17 00:00:00 2001
From: Damien Martin-Guillerez <dmarting@google.com>
Date: Thu, 14 Dec 2017 10:40:35 -0500
Subject: Add a non remote execution build to compare build times

Change-Id: Ie355e9f122c074b24d119438e1f0a6e75300d1d1
PiperOrigin-RevId: 179043273
---
 scripts/ci/bazel-tests-remote.json | 53 ++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 22 deletions(-)

(limited to 'scripts')

diff --git a/scripts/ci/bazel-tests-remote.json b/scripts/ci/bazel-tests-remote.json
index 6123068428..5c3e735da0 100644
--- a/scripts/ci/bazel-tests-remote.json
+++ b/scripts/ci/bazel-tests-remote.json
@@ -1,37 +1,46 @@
 [
     {
-        "configurations": [
-            {"node": "ubuntu_16.04-x86_64"}
-        ],
         "parameters": {
             "startup_opts": [
                 "--host_jvm_args=-Dbazel.DigestFunction=SHA1"
             ],
-            "build_opts": [
-                "--remote_cache=remotebuildexecution.googleapis.com",
-                "--remote_executor=remotebuildexecution.googleapis.com",
-                "--remote_instance_name=projects/bazel-public",
-                "--spawn_strategy=remote",
-                "--remote_timeout=3600",
-                "--strategy=Javac=remote",
-                "--strategy=Closure=remote",
-                "--genrule_strategy=remote",
-                "--auth_enabled=true",
-                "--tls_enabled=true",
-                "--jobs=75",
-                "--experimental_strict_action_env=true",
-                "--experimental_remote_platform_override='properties:{ name:\"container-image\" value:\"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:aa20628a902f06a11a015caa94b0432eb60690de2d2525bd046b9eea046f5d8a\" }'",
-                "--crosstool_top=@bazel_toolchains//configs/debian8_clang/0.2.0/bazel_0.7.0:toolchain",
-                "--host_java_toolchain=@bazel_toolchains//configs/java/0.1.0/bazel_0.6.0:remote_toolchain",
-                "--java_toolchain=@bazel_toolchains//configs/java/0.1.0/bazel_0.6.0:remote_toolchain"
-            ],
             "tests": [
                 "//src/test/shell/integration/...",
                 "//src/test/java/... - //src/test/java/com/google/devtools/build/android/..."
             ],
             "test_tag_filters": ["-slow"],
-            "targets": [],
+            "targets": []
         },
+        "configurations": [
+            {
+                "node": "ubuntu_16.04-x86_64",
+                "type": "remote",
+                "parameters": {
+                    "build_opts": [
+                        "--remote_cache=remotebuildexecution.googleapis.com",
+                        "--remote_executor=remotebuildexecution.googleapis.com",
+                        "--remote_instance_name=projects/bazel-public",
+                        "--spawn_strategy=remote",
+                        "--remote_timeout=3600",
+                        "--strategy=Javac=remote",
+                        "--strategy=Closure=remote",
+                        "--genrule_strategy=remote",
+                        "--auth_enabled=true",
+                        "--tls_enabled=true",
+                        "--jobs=75",
+                        "--experimental_strict_action_env=true",
+                        "--experimental_remote_platform_override='properties:{ name:\"container-image\" value:\"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:aa20628a902f06a11a015caa94b0432eb60690de2d2525bd046b9eea046f5d8a\" }'",
+                        "--crosstool_top=@bazel_toolchains//configs/debian8_clang/0.2.0/bazel_0.7.0:toolchain",
+                        "--host_java_toolchain=@bazel_toolchains//configs/java/0.1.0/bazel_0.6.0:remote_toolchain",
+                        "--java_toolchain=@bazel_toolchains//configs/java/0.1.0/bazel_0.6.0:remote_toolchain"
+                    ]
+               }
+           },
+           {
+               "node": "ubuntu_16.04-x86_64",
+               "type": "local"
+           }
+	      ]
     }
 ]
 
-- 
cgit v1.2.3