Enabling debug mode, removing nvm references, installing deps, and in…

…creasing timeouts.
grpc · Mar 13, 2018 · 8857cca · 8857cca
1 parent 64e3e9d
commit 8857cca
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 15 deletions.
diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_all_linux_artifacts.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_all_linux_artifacts.sh
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source ~/.nvm/nvm.sh
-
-nvm install 8
 set -ex
 
 cd $(dirname $0)

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+set -ex
+
 NODE_ALPINE_BUILD=false
 
 while true ; do

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source ~/.nvm/nvm.sh
-
-nvm use 8
 set -ex
 
 cd $(dirname $0)/../../..

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_package_node.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_package_node.sh
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source ~/.nvm/nvm.sh
-
-nvm use 8
 set -ex
 
 cd $(dirname $0)/../../..

diff --git a/tools/release/kokoro.sh b/tools/release/kokoro.sh
@@ -13,25 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -e
+set -ex
 cd $(dirname $0)/../..
 base_dir=$(pwd)
 
 # Install gRPC and its submodules.
 git submodule update --init
 git submodule foreach --recursive git submodule update --init
 
+pip install mako
 ./packages/grpc-native-core/tools/buildgen/generate_projects.sh
 
 OS=`uname`
 
 case $OS in
 Linux)
+    sudo apt-get update
+    sudo apt-get install -y linux-libc-dev:i386 g++-aarch64-linux-gnu g++-arm-linux-gnueabihf
     ./packages/grpc-native-core/tools/run_tests/artifacts/build_all_linux_artifacts.sh
     mv packages/grpc-native-core/artifacts .
     ;;
 Darwin)
-    export ARTIFACTS_OUT=$(base_dir)/artifacts
-    ./packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
+    ARTIFACTS_OUT=$base_dir/artifacts ./packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
     ;;
 esac
diff --git a/tools/release/kokoro/linux.cfg b/tools/release/kokoro/linux.cfg
@@ -16,7 +16,7 @@
 
 # Location of the continuous shell script in repository.
 build_file: "grpc-node/tools/release/kokoro.sh"
-timeout_mins: 60
+timeout_mins: 180
 action {
   define_artifacts {
     regex: "github/grpc-node/artifacts/**",

diff --git a/tools/release/kokoro/macos.cfg b/tools/release/kokoro/macos.cfg
@@ -16,7 +16,7 @@
 
 # Location of the continuous shell script in repository.
 build_file: "grpc-node/tools/release/kokoro.sh"
-timeout_mins: 60
+timeout_mins: 120
 action {
   define_artifacts {
     regex: "github/grpc-node/artifacts/**",

diff --git a/tools/release/kokoro/windows.cfg b/tools/release/kokoro/windows.cfg
@@ -16,7 +16,7 @@
 
 # Location of the continuous shell script in repository.
 build_file: "grpc-node/tools/release/kokoro.bat"
-timeout_mins: 60
+timeout_mins: 120
 action {
   define_artifacts {
     regex: "github/grpc-node/artifacts/**",