From c74057796360bd4a209374c0c6319d04ff4d8dbb Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Thu, 22 Feb 2018 11:39:14 -0800
Subject: [PATCH 1/8] Update version to v1.10.0-pre1

---
 packages/grpc-native-core/binding.gyp  | 2 +-
 packages/grpc-native-core/deps/grpc    | 2 +-
 packages/grpc-native-core/package.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp
index 85f0618e..6a2d69fe 100644
--- a/packages/grpc-native-core/binding.gyp
+++ b/packages/grpc-native-core/binding.gyp
@@ -788,10 +788,10 @@
         'deps/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc',
         'deps/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.cc',
         'deps/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.cc',
+        'deps/grpc/src/core/lib/security/security_connector/security_connector.cc',
         'deps/grpc/src/core/lib/security/transport/client_auth_filter.cc',
         'deps/grpc/src/core/lib/security/transport/lb_targets_info.cc',
         'deps/grpc/src/core/lib/security/transport/secure_endpoint.cc',
-        'deps/grpc/src/core/lib/security/transport/security_connector.cc',
         'deps/grpc/src/core/lib/security/transport/security_handshaker.cc',
         'deps/grpc/src/core/lib/security/transport/server_auth_filter.cc',
         'deps/grpc/src/core/lib/security/transport/tsi_error.cc',
diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc
index 34e8e0a6..756acb78 160000
--- a/packages/grpc-native-core/deps/grpc
+++ b/packages/grpc-native-core/deps/grpc
@@ -1 +1 @@
-Subproject commit 34e8e0a6400d8b529125a3b83ec1facf71acf99b
+Subproject commit 756acb78f6ac8a6f6533a55a09590b8e598d112b
diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
index 44b029d6..6d36ab8b 100644
--- a/packages/grpc-native-core/package.json
+++ b/packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.10.0-dev",
+  "version": "1.10.0-pre1",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",

From 00d93a50eff24037b5483c6c97e02a9eaa053463 Mon Sep 17 00:00:00 2001
From: Nicolas Noble <nicolasnoble@users.noreply.github.com>
Date: Fri, 23 Feb 2018 12:24:22 -0800
Subject: [PATCH 2/8] Update Windows test to force using TLS/1.2

https://githubengineering.com/crypto-removal-notice/ broke the windows test. Forcing Powershell to update to TLS/1.2.
---
 install-nvm-windows.ps1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install-nvm-windows.ps1 b/install-nvm-windows.ps1
index 709a1ec2..b3794055 100644
--- a/install-nvm-windows.ps1
+++ b/install-nvm-windows.ps1
@@ -15,6 +15,9 @@
 # We're going to store nvm-windows in the .\nvm directory.
 $env:NVM_HOME = (Get-Item -Path ".\" -Verbose).FullName + "\nvm"
 
+# Switching to TLS/1.2 - see https://githubengineering.com/crypto-removal-notice/
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
 # Downloading and unpacking nvm-windows
 Invoke-WebRequest -Uri https://github.com/coreybutler/nvm-windows/releases/download/1.1.5/nvm-noinstall.zip -OutFile nvm-noinstall.zip
 Add-Type -AssemblyName System.IO.Compression.FileSystem

From 2573548de8c7102a7384883fa17555ed6ac7e941 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Fri, 9 Mar 2018 10:44:52 -0800
Subject: [PATCH 3/8] Update to v1.10.0

---
 packages/grpc-native-core/deps/grpc    | 2 +-
 packages/grpc-native-core/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc
index 756acb78..474c5950 160000
--- a/packages/grpc-native-core/deps/grpc
+++ b/packages/grpc-native-core/deps/grpc
@@ -1 +1 @@
-Subproject commit 756acb78f6ac8a6f6533a55a09590b8e598d112b
+Subproject commit 474c5950686e3962bd339c93d27e369bf64f568f
diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
index 6d36ab8b..e3bb175d 100644
--- a/packages/grpc-native-core/package.json
+++ b/packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.10.0-pre1",
+  "version": "1.10.0",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",

From 03fb2cbb040da0757b6b32a4fdefbeed2e2ff788 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Mon, 12 Mar 2018 21:22:01 +0100
Subject: [PATCH 4/8] Adding builds to our CI.

---
 kokoro.bat => test/kokoro.bat    |  3 +++
 kokoro.sh => test/kokoro.sh      |  6 +++++-
 test/kokoro/linux.cfg            |  2 +-
 test/kokoro/macos.cfg            |  2 +-
 test/kokoro/windows.cfg          |  2 +-
 tools/release/kokoro.bat         | 28 ++++++++++++++++++++++++
 tools/release/kokoro.sh          | 37 ++++++++++++++++++++++++++++++++
 tools/release/kokoro/linux.cfg   | 25 +++++++++++++++++++++
 tools/release/kokoro/macos.cfg   | 25 +++++++++++++++++++++
 tools/release/kokoro/windows.cfg | 25 +++++++++++++++++++++
 10 files changed, 151 insertions(+), 4 deletions(-)
 rename kokoro.bat => test/kokoro.bat (95%)
 rename kokoro.sh => test/kokoro.sh (86%)
 create mode 100644 tools/release/kokoro.bat
 create mode 100755 tools/release/kokoro.sh
 create mode 100644 tools/release/kokoro/linux.cfg
 create mode 100644 tools/release/kokoro/macos.cfg
 create mode 100644 tools/release/kokoro/windows.cfg

diff --git a/kokoro.bat b/test/kokoro.bat
similarity index 95%
rename from kokoro.bat
rename to test/kokoro.bat
index fc5fd8b2..47a31e37 100644
--- a/kokoro.bat
+++ b/test/kokoro.bat
@@ -15,8 +15,11 @@
 @echo "Starting Windows test"
 
 cd /d %~dp0
+cd ..
 
 git submodule update --init
 git submodule foreach --recursive git submodule update --init
 
+call tools\release\kokoro.bat
+
 .\run-tests.bat
diff --git a/kokoro.sh b/test/kokoro.sh
similarity index 86%
rename from kokoro.sh
rename to test/kokoro.sh
index 3e51749c..dbc6c8db 100755
--- a/kokoro.sh
+++ b/test/kokoro.sh
@@ -14,10 +14,14 @@
 # limitations under the License.
 
 set -e
-cd $(dirname $0)
+cd $(dirname $0)/..
 
 # Install gRPC and its submodules.
 git submodule update --init
 git submodule foreach --recursive git submodule update --init
 
+./packages/grpc-native-core/tools/buildgen/generate_projects.sh
+
+./tools/release/kokoro.sh
+
 ./run-tests.sh
diff --git a/test/kokoro/linux.cfg b/test/kokoro/linux.cfg
index c6b2c88f..f40e6db4 100644
--- a/test/kokoro/linux.cfg
+++ b/test/kokoro/linux.cfg
@@ -15,7 +15,7 @@
 # Config file for Kokoro (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc-node/kokoro.sh"
+build_file: "grpc-node/test/kokoro.sh"
 timeout_mins: 60
 action {
   define_artifacts {
diff --git a/test/kokoro/macos.cfg b/test/kokoro/macos.cfg
index c6b2c88f..f40e6db4 100644
--- a/test/kokoro/macos.cfg
+++ b/test/kokoro/macos.cfg
@@ -15,7 +15,7 @@
 # Config file for Kokoro (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc-node/kokoro.sh"
+build_file: "grpc-node/test/kokoro.sh"
 timeout_mins: 60
 action {
   define_artifacts {
diff --git a/test/kokoro/windows.cfg b/test/kokoro/windows.cfg
index e4a4524b..2b9d0906 100644
--- a/test/kokoro/windows.cfg
+++ b/test/kokoro/windows.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.bat"
+build_file: "grpc-node/test/kokoro.bat"
 timeout_mins: 60
diff --git a/tools/release/kokoro.bat b/tools/release/kokoro.bat
new file mode 100644
index 00000000..e86e01bd
--- /dev/null
+++ b/tools/release/kokoro.bat
@@ -0,0 +1,28 @@
+@rem Copyright 2018 gRPC authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+
+@echo "Starting Windows build"
+
+cd /d %~dp0
+cd ..\..
+
+git submodule update --init
+git submodule foreach --recursive git submodule update --init
+
+set ARTIFACTS_OUT=artifacts
+cd packages\grpc-native-core
+call tools\run_tests\artifacts\build_artifact_node.bat
+cd ..\..
+
+move packages\grpc-native-core\artifacts .
diff --git a/tools/release/kokoro.sh b/tools/release/kokoro.sh
new file mode 100755
index 00000000..7282c737
--- /dev/null
+++ b/tools/release/kokoro.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright 2018 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)/../..
+base_dir=$(pwd)
+
+# Install gRPC and its submodules.
+git submodule update --init
+git submodule foreach --recursive git submodule update --init
+
+./packages/grpc-native-core/tools/buildgen/generate_projects.sh
+
+OS=`uname`
+
+case $OS in
+Linux)
+    ./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
+    ;;
+esac
diff --git a/tools/release/kokoro/linux.cfg b/tools/release/kokoro/linux.cfg
new file mode 100644
index 00000000..80bc144f
--- /dev/null
+++ b/tools/release/kokoro/linux.cfg
@@ -0,0 +1,25 @@
+# Copyright 2018 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.
+
+# Config file for Kokoro (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc-node/tools/release/kokoro.sh"
+timeout_mins: 60
+action {
+  define_artifacts {
+    regex: "github/grpc-node/artifacts/**",
+    strip_prefix: "github/grpc-node/artifacts"
+  }
+}
diff --git a/tools/release/kokoro/macos.cfg b/tools/release/kokoro/macos.cfg
new file mode 100644
index 00000000..80bc144f
--- /dev/null
+++ b/tools/release/kokoro/macos.cfg
@@ -0,0 +1,25 @@
+# Copyright 2018 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.
+
+# Config file for Kokoro (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc-node/tools/release/kokoro.sh"
+timeout_mins: 60
+action {
+  define_artifacts {
+    regex: "github/grpc-node/artifacts/**",
+    strip_prefix: "github/grpc-node/artifacts"
+  }
+}
diff --git a/tools/release/kokoro/windows.cfg b/tools/release/kokoro/windows.cfg
new file mode 100644
index 00000000..925126e5
--- /dev/null
+++ b/tools/release/kokoro/windows.cfg
@@ -0,0 +1,25 @@
+# Copyright 2018 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.
+
+# Config file for Kokoro (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc-node/tools/release/kokoro.bat"
+timeout_mins: 60
+action {
+  define_artifacts {
+    regex: "github/grpc-node/artifacts/**",
+    strip_prefix: "github/grpc-node/artifacts"
+  }
+}

From 50c5b06479a14f0af661eb83bd19f7dd79ebf21f Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Mon, 12 Mar 2018 22:57:35 +0100
Subject: [PATCH 5/8] Splitting build and test jobs.

---
 test/kokoro/linux-build.cfg   | 19 +++++++++++++++++++
 test/kokoro/macos-build.cfg   | 19 +++++++++++++++++++
 test/kokoro/windows-build.cfg | 19 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 test/kokoro/linux-build.cfg
 create mode 100644 test/kokoro/macos-build.cfg
 create mode 100644 test/kokoro/windows-build.cfg

diff --git a/test/kokoro/linux-build.cfg b/test/kokoro/linux-build.cfg
new file mode 100644
index 00000000..b5e6d6e6
--- /dev/null
+++ b/test/kokoro/linux-build.cfg
@@ -0,0 +1,19 @@
+# Copyright 2018 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.
+
+# Config file for Kokoro (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc-node/tools/release/kokoro.sh"
+timeout_mins: 60
diff --git a/test/kokoro/macos-build.cfg b/test/kokoro/macos-build.cfg
new file mode 100644
index 00000000..b5e6d6e6
--- /dev/null
+++ b/test/kokoro/macos-build.cfg
@@ -0,0 +1,19 @@
+# Copyright 2018 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.
+
+# Config file for Kokoro (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc-node/tools/release/kokoro.sh"
+timeout_mins: 60
diff --git a/test/kokoro/windows-build.cfg b/test/kokoro/windows-build.cfg
new file mode 100644
index 00000000..1885ef39
--- /dev/null
+++ b/test/kokoro/windows-build.cfg
@@ -0,0 +1,19 @@
+# Copyright 2018 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.
+
+# Config file for Kokoro (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc-node/tools/release/kokoro.bat"
+timeout_mins: 60

From 64e3e9d764862a2151a03230e340a9422257b30c Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Mon, 12 Mar 2018 23:23:23 +0100
Subject: [PATCH 6/8] Don't do release build tests in the normal tests.

---
 test/kokoro.bat | 2 --
 test/kokoro.sh  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/test/kokoro.bat b/test/kokoro.bat
index 47a31e37..1f0fabfc 100644
--- a/test/kokoro.bat
+++ b/test/kokoro.bat
@@ -20,6 +20,4 @@ cd ..
 git submodule update --init
 git submodule foreach --recursive git submodule update --init
 
-call tools\release\kokoro.bat
-
 .\run-tests.bat
diff --git a/test/kokoro.sh b/test/kokoro.sh
index dbc6c8db..c4b9373b 100755
--- a/test/kokoro.sh
+++ b/test/kokoro.sh
@@ -22,6 +22,4 @@ git submodule foreach --recursive git submodule update --init
 
 ./packages/grpc-native-core/tools/buildgen/generate_projects.sh
 
-./tools/release/kokoro.sh
-
 ./run-tests.sh

From 8857ccae3422bf9e5440bcb84a7e112c70746cb8 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Tue, 13 Mar 2018 01:06:53 +0100
Subject: [PATCH 7/8] Enabling debug mode, removing nvm references, installing
 deps, and increasing timeouts.

---
 .../run_tests/artifacts/build_all_linux_artifacts.sh      | 3 ---
 .../tools/run_tests/artifacts/build_artifact_node.sh      | 3 +++
 .../tools/run_tests/artifacts/build_artifact_node_arm.sh  | 3 ---
 .../tools/run_tests/artifacts/build_package_node.sh       | 3 ---
 tools/release/kokoro.sh                                   | 8 +++++---
 tools/release/kokoro/linux.cfg                            | 2 +-
 tools/release/kokoro/macos.cfg                            | 2 +-
 tools/release/kokoro/windows.cfg                          | 2 +-
 8 files changed, 11 insertions(+), 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
index 2d34d4d7..25fb545f 100755
--- 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
index d8128863..734d7182 100755
--- 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
index b33f8dec..8c0202ca 100755
--- 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
index 2860f68b..412d0be2 100755
--- 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
index 7282c737..32303b2e 100755
--- a/tools/release/kokoro.sh
+++ b/tools/release/kokoro.sh
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -e
+set -ex
 cd $(dirname $0)/../..
 base_dir=$(pwd)
 
@@ -21,17 +21,19 @@ base_dir=$(pwd)
 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
index 80bc144f..b3348f8d 100644
--- 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
index 80bc144f..73a539fa 100644
--- 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
index 925126e5..1ba6123f 100644
--- 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/**",

From fcf472e7cb965194a52e36b2635508368c9c5f1a Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Tue, 13 Mar 2018 22:22:31 +0100
Subject: [PATCH 8/8] Adding JOBS environment variable to speed builds up, and
 reducing scope of Alpine Linux builds.

---
 .../artifacts/build_all_linux_artifacts.sh      |  3 ++-
 .../run_tests/artifacts/build_artifact_node.bat |  2 ++
 .../run_tests/artifacts/build_artifact_node.sh  | 17 ++++++-----------
 run-tests.bat                                   |  1 +
 run-tests.sh                                    |  1 +
 tools/release/kokoro.sh                         |  2 +-
 6 files changed, 13 insertions(+), 13 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
index 25fb545f..59f62a2f 100755
--- 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
@@ -21,6 +21,7 @@ cd $tool_dir/../../..
 base_dir=$(pwd)
 
 export ARTIFACTS_OUT=$base_dir/artifacts
+export JOBS=8
 
 rm -rf build || true
 
@@ -32,4 +33,4 @@ $tool_dir/build_artifact_node.sh
 
 $tool_dir/build_artifact_node_arm.sh
 
-docker run -e ARTIFACTS_OUT=/var/grpc/artifacts -v $base_dir:/var/grpc alpine_node_artifact bash -c /var/grpc/tools/run_tests/artifacts/build_artifact_node.sh --with-alpine
+docker run -e JOBS=8 -e ARTIFACTS_OUT=/var/grpc/artifacts -v $base_dir:/var/grpc alpine_node_artifact /var/grpc/tools/run_tests/artifacts/build_artifact_node.sh --with-alpine
diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
index a3323684..41177f90 100644
--- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
+++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
@@ -20,6 +20,8 @@ set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0
 
 set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
 
+set JOBS=8
+
 del /f /q BUILD || rmdir build /s /q
 
 call npm update || goto :error
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
index 734d7182..e00eb6a0 100755
--- 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
@@ -16,12 +16,15 @@
 
 set -ex
 
-NODE_ALPINE_BUILD=false
+arch_list=( ia32 x64 )
+node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 )
+electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 )
 
 while true ; do
   case $1 in
   --with-alpine)
-    NODE_ALPINE_BUILD=true
+    arch_list=( x64 )
+    electron_versions=( )
     ;;
   "")
     ;;
@@ -33,8 +36,6 @@ while true ; do
   shift || break
 done
 
-NODE_ALPINE_BUILD=$1
-
 umask 022
 
 cd $(dirname $0)/../../..
@@ -45,17 +46,11 @@ mkdir -p "${ARTIFACTS_OUT}"
 
 npm update
 
-arch_list=( ia32 x64 )
-
-node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 )
-
-electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 )
-
 for arch in ${arch_list[@]}
 do
   for version in ${node_versions[@]}
   do
-    ./node_modules/.bin/node-pre-gyp configure rebuild package --target=$version --target_arch=$arch --grpc_alpine=$NODE_ALPINE_BUILD
+    ./node_modules/.bin/node-pre-gyp configure rebuild package --target=$version --target_arch=$arch
     cp -r build/stage/* "${ARTIFACTS_OUT}"/
   done
 
diff --git a/run-tests.bat b/run-tests.bat
index 92c2b299..bd9a83a9 100644
--- a/run-tests.bat
+++ b/run-tests.bat
@@ -20,6 +20,7 @@ PowerShell -Command .\install-nvm-windows.ps1
 SET NVM_HOME=%ROOT%nvm
 SET NVM_SYMLINK=%ROOT%nvm\nodejs
 SET PATH=%NVM_HOME%;%NVM_SYMLINK%;%PATH%
+SET JOBS=8
 
 nvm version
 
diff --git a/run-tests.sh b/run-tests.sh
index c1a76889..5df88186 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -38,6 +38,7 @@ set -ex
 npm install --unsafe-perm
 
 mkdir -p reports
+export JOBS=8
 
 # TODO(mlumish): Add electron tests
 
diff --git a/tools/release/kokoro.sh b/tools/release/kokoro.sh
index 32303b2e..e5b578f7 100755
--- a/tools/release/kokoro.sh
+++ b/tools/release/kokoro.sh
@@ -34,6 +34,6 @@ Linux)
     mv packages/grpc-native-core/artifacts .
     ;;
 Darwin)
-    ARTIFACTS_OUT=$base_dir/artifacts ./packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
+    JOBS=8 ARTIFACTS_OUT=$base_dir/artifacts ./packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
     ;;
 esac