From c5c8c35114eed2b0cdc7fefa75c2d795aa2dc0b0 Mon Sep 17 00:00:00 2001
From: Damien Martin-Guillerez <dmarting@google.com>
Date: Wed, 6 Sep 2017 16:15:40 +0200
Subject: Simplify bazel-{,docker-}tests.json

Remove optional variation and simplify node specifications.

Change-Id: Ie0a137768312152d9c036a94e5214b419b3c12ce
PiperOrigin-RevId: 167717139
---
 scripts/ci/bazel-docker-tests.json |  2 --
 scripts/ci/bazel-tests.json        | 31 ++++++-------------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

(limited to 'scripts')

diff --git a/scripts/ci/bazel-docker-tests.json b/scripts/ci/bazel-docker-tests.json
index bec4b0be3c..0fc2cd2155 100644
--- a/scripts/ci/bazel-docker-tests.json
+++ b/scripts/ci/bazel-docker-tests.json
@@ -1,7 +1,6 @@
 [
     {
         "node": "docker",
-        "variation": "",
         "shard": "1",
         "parameters": {
             "targets": [],
@@ -12,7 +11,6 @@
     },
     {
         "node": "docker",
-        "variation": "",
         "shard": "2",
         "parameters": {
             "targets": [],
diff --git a/scripts/ci/bazel-tests.json b/scripts/ci/bazel-tests.json
index 6e5bada223..076136a276 100644
--- a/scripts/ci/bazel-tests.json
+++ b/scripts/ci/bazel-tests.json
@@ -3,14 +3,8 @@
 [
     {
         "configurations": [
-            {
-                "node": "linux-x86_64",
-                "variation": ""
-            },
-            {
-                "node": "ubuntu_16.04-x86_64",
-                "variation": ""
-            }
+            {"node": "linux-x86_64"},
+            {"node": "ubuntu_16.04-x86_64"}
         ],
         "parameters": {
             "configure": [
@@ -36,14 +30,8 @@
         }
     }, {
         "configurations": [
-            {
-                "node": "freebsd-11",
-                "variation": ""
-            },
-            {
-                "node": "freebsd-12",
-                "variation": ""
-            }
+            {"node": "freebsd-11"},
+            {"node": "freebsd-12"}
         ],
         "parameters": {
             // As configure step, we redo the USES=shebangfix of the devel/bazel
@@ -66,7 +54,6 @@
         }
     }, {
         "node": "darwin-x86_64",
-        "variation": "",
         "parameters": {
             "configure": [
                 "echo >>WORKSPACE",
@@ -93,10 +80,7 @@
         }
     }, {
         "toolchain": "msvc",
-        "configurations": [{
-            "node": "windows-x86_64",
-            "variation": ""
-        }],
+        "node": "windows-x86_64",
         "parameters": {
             "build_opts": [
                 "--copt=-w",
@@ -124,10 +108,7 @@
         }
     }, {
         "toolchain": "msys",
-        "configurations": [{
-            "node": "windows-x86_64",
-            "variation": ""
-        }],
+        "node": "windows-x86_64",
         "parameters": {
             "build_opts": ["--cpu=x64_windows_msys", "--host_cpu=x64_windows_msys"],
             "test_tag_filters": ["-no_windows"],
-- 
cgit v1.2.3