Merge pull request #36 from nicolasnoble/kokoro-fixups

Splitting kokoro.sh into run-tests.sh.

kokoro.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+# Copyright 2017 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+cd $(dirname $0)
+
+# Install gRPC and its submodules.
+git submodule update --init
+git submodule foreach --recursive git submodule update --init
+
+./run-tests.sh

run-tests.sh

@@ -22,11 +22,9 @@ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.4/install.sh | b
 set -e
 cd $(dirname $0)
 
-# Install gRPC and its submodules.
-git submodule update --init
-git submodule foreach --recursive git submodule update --init
-
-node_versions="6 7 8"
+if [ "x$node_versions" == "x" ] ; then
+  node_versions="6 7 8"
+fi
 
 # TODO(mlumish): Add electron tests
 

test/kokoro/linux.cfg

@@ -15,5 +15,5 @@
 # Config file for Kokoro (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc-node/kokoro-linux.sh"
+build_file: "grpc-node/kokoro.sh"
 timeout_mins: 60

test/kokoro/macos.cfg

@@ -15,5 +15,5 @@
 # Config file for Kokoro (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc-node/kokoro-linux.sh"
+build_file: "grpc-node/kokoro.sh"
 timeout_mins: 60