From 84304ff1c294710ee5efbc85e6e4a443ba2d6a08 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 16 Sep 2017 01:04:41 +0200 Subject: [PATCH] Splitting kokoro.sh into run-tests.sh. --- kokoro.sh | 23 +++++++++++++++++++++++ kokoro-linux.sh => run-tests.sh | 8 +++----- test/kokoro/linux.cfg | 2 +- test/kokoro/macos.cfg | 2 +- 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100755 kokoro.sh rename kokoro-linux.sh => run-tests.sh (88%) diff --git a/kokoro.sh b/kokoro.sh new file mode 100755 index 00000000..3e51749c --- /dev/null +++ b/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 diff --git a/kokoro-linux.sh b/run-tests.sh similarity index 88% rename from kokoro-linux.sh rename to run-tests.sh index c5894df1..2fce4dd4 100755 --- a/kokoro-linux.sh +++ b/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 diff --git a/test/kokoro/linux.cfg b/test/kokoro/linux.cfg index 6cd2fca6..0bebf56a 100644 --- a/test/kokoro/linux.cfg +++ b/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 diff --git a/test/kokoro/macos.cfg b/test/kokoro/macos.cfg index 6cd2fca6..0bebf56a 100644 --- a/test/kokoro/macos.cfg +++ b/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