Merge pull request mozilla#2504 from lissyx/node-13

Add NodeJS v13
lissyx · Nov 7, 2019 · 23e72a6 · 23e72a6
2 parents 43a187a + de71d65
commit 23e72a6
Show file tree

Hide file tree

Showing 99 changed files with 270 additions and 94 deletions.
diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
@@ -27,10 +27,12 @@ nodejs:
     prep_10: 'echo "deb http://deb.nodesource.com/node_10.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
     prep_11: 'echo "deb http://deb.nodesource.com/node_11.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
     prep_12: 'echo "deb http://deb.nodesource.com/node_12.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
+    prep_13: 'echo "deb http://deb.nodesource.com/node_13.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
   packages_docs_bionic:
     apt: 'nodejs'
     apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences'
     prep_12: 'echo "deb http://deb.nodesource.com/node_12.x bionic main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
+    prep_13: 'echo "deb http://deb.nodesource.com/node_13.x bionic main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
   packages_buster:
     apt: 'nodejs sox'
     apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences'
@@ -43,6 +45,7 @@ nodejs:
     prep_10: 'echo "deb http://deb.nodesource.com/node_10.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
     prep_11: 'echo "deb http://deb.nodesource.com/node_11.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
     prep_12: 'echo "deb http://deb.nodesource.com/node_12.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
+    prep_13: 'echo "deb http://deb.nodesource.com/node_13.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
   brew:
     # Using 'nvm' from homebrew results in installing v0.33.6 which seems to
     # suffer from a bug making it unable to work as of now:
@@ -61,6 +64,7 @@ nodejs:
     prep_10: 'nvm install 10.16.0 && nvm use 10.16.0'
     prep_11: 'nvm install 11.15.0 && nvm use 11.15.0'
     prep_12: 'nvm install 12.5.0 && nvm use 12.5.0'
+    prep_13: 'nvm install 13.0.1 && nvm use 13.0.1'
   win:
     prep_4: '/usr/bin/wget.exe https://nodejs.org/dist/v4.9.1/node-v4.9.1-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v4.9.1-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v4.9.1-win-x64/:$PATH'
     prep_6: '/usr/bin/wget.exe https://nodejs.org/dist/v6.17.1/node-v6.17.1-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v6.17.1-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v6.17.1-win-x64/:$PATH'
@@ -70,6 +74,7 @@ nodejs:
     prep_10: '/usr/bin/wget.exe https://nodejs.org/dist/v10.16.0/node-v10.16.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v10.16.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v10.16.0-win-x64/:$PATH'
     prep_11: '/usr/bin/wget.exe https://nodejs.org/dist/v11.15.0/node-v11.15.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v11.15.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v11.15.0-win-x64/:$PATH'
     prep_12: '/usr/bin/wget.exe https://nodejs.org/dist/v12.5.0/node-v12.5.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v12.5.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v12.5.0-win-x64/:$PATH'
+    prep_13: '/usr/bin/wget.exe https://nodejs.org/dist/v13.0.1/node-v13.0.1-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v13.0.1-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v13.0.1-win-x64/:$PATH'
 ## swig -javascript requires swig >= 3.0.7 (14.04 provides 2.0.11)
 ## force 3.0.10 for nodejs V8 API compatibility
 swig:

diff --git a/taskcluster/examples-ffmpeg_vad_streaming-node10.yml b/taskcluster/examples-ffmpeg_vad_streaming-node10.yml
@@ -2,7 +2,7 @@ build:
   template_file: examples-base.tyml
   docker_image: "node:10"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       apt-get -qq -y install ffmpeg

diff --git a/taskcluster/examples-ffmpeg_vad_streaming-node8.yml b/taskcluster/examples-ffmpeg_vad_streaming-node8.yml
@@ -2,7 +2,7 @@ build:
   template_file: examples-base.tyml
   docker_image: "node:8"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   system_setup:
     >
       apt-get -qq -y install ffmpeg

diff --git a/taskcluster/examples-nodejs_wav-node10.yml b/taskcluster/examples-nodejs_wav-node10.yml
@@ -2,7 +2,7 @@ build:
   template_file: examples-base.tyml
   docker_image: "node:10"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/examples/nodejs_wav/test.sh"
   metadata:

diff --git a/taskcluster/examples-nodejs_wav-node8.yml b/taskcluster/examples-nodejs_wav-node8.yml
@@ -2,7 +2,7 @@ build:
   template_file: examples-base.tyml
   docker_image: "node:8"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/examples/nodejs_wav/test.sh"
   metadata:

diff --git a/taskcluster/tc-electron-tests.sh b/taskcluster/tc-electron-tests.sh
@@ -29,7 +29,8 @@ export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:${NODE_PATH}/electron/dist/:$PATH"
 
 npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} electron@${electronver}
 
-npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz
+deepspeech_npm_url=$(get_dep_npm_pkg_url)
+npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 if [ "${OS}" = "Darwin" ]; then
   ln -s Electron.app/Contents/MacOS/Electron "${NODE_ROOT}/node_modules/electron/dist/node"

diff --git a/taskcluster/tc-node-tests-prod.sh b/taskcluster/tc-node-tests-prod.sh
@@ -27,7 +27,8 @@ NODE_CACHE="${DS_ROOT_TASK}/ds-test.cache/"
 export NODE_PATH="${NODE_ROOT}/node_modules/"
 export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:$PATH"
 
-npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz
+deepspeech_npm_url=$(get_dep_npm_pkg_url)
+npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 

diff --git a/taskcluster/tc-node-tests.sh b/taskcluster/tc-node-tests.sh
@@ -21,7 +21,8 @@ NODE_CACHE="${DS_ROOT_TASK}/ds-test.cache/"
 export NODE_PATH="${NODE_ROOT}/node_modules/"
 export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:$PATH"
 
-npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz
+deepspeech_npm_url=$(get_dep_npm_pkg_url)
+npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 

diff --git a/taskcluster/tc-node_tflite-tests.sh b/taskcluster/tc-node_tflite-tests.sh
@@ -25,7 +25,8 @@ NODE_CACHE="${DS_ROOT_TASK}/ds-test.cache/"
 export NODE_PATH="${NODE_ROOT}/node_modules/"
 export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:$PATH"
 
-npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz
+deepspeech_npm_url=$(get_dep_npm_pkg_url)
+npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 

diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
@@ -56,7 +56,7 @@ model_name_mmap="$(basename -s ".pb" "${model_source}").pbmm"
 model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}"
 
 SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.16:ucs2 2.7.16:ucs4 3.4.10:ucs4 3.5.7:ucs4 3.6.8:ucs4 3.7.3:ucs4 3.8.0:ucs4}
-SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0}
+SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0 13.0.1}
 SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-1.6.18 1.7.16 1.8.8 2.0.18 3.0.16 3.1.11 4.0.3 4.1.5 4.2.5 5.0.6 6.0.11 7.0.1}
 
 strip() {
@@ -1080,6 +1080,25 @@ get_python_pkg_url()
   echo "${root}/${deepspeech_pkg}"
 }
 
+# Will inspect this task's dependencies for one that provides a matching npm package
+get_dep_npm_pkg_url()
+{
+  local all_deps="$(curl -s https://community-tc.services.mozilla.com/api/queue/v1/task/${TASK_ID} | python -c 'import json; import sys; print(" ".join(json.loads(sys.stdin.read())["dependencies"]));')"
+  local deepspeech_pkg="deepspeech-${DS_VERSION}.tgz"
+
+  for dep in ${all_deps}; do
+    local has_artifact=$(curl -s https://community-tc.services.mozilla.com/api/queue/v1/task/${dep}/artifacts | python -c 'import json; import sys; has_artifact = True in [ e["name"].find("'${deepspeech_pkg}'") > 0 for e in json.loads(sys.stdin.read())["artifacts"] ]; print(has_artifact)')
+    if [ "${has_artifact}" = "True" ]; then
+      echo "https://community-tc.services.mozilla.com/api/queue/v1/task/${dep}/artifacts/public/${deepspeech_pkg}"
+      exit 0
+    fi;
+  done;
+
+  echo ""
+  # This should not be reached, otherwise it means we could not find a matching nodejs package
+  exit 1
+}
+
 extract_python_versions()
 {
   # call extract_python_versions ${pyver_full} pyver pyver_pkg py_unicode_type pyconf pyalias

diff --git a/taskcluster/test-armbian-opt-base.tyml b/taskcluster/test-armbian-opt-base.tyml
@@ -33,10 +33,8 @@ then:
       $let:
         training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
         linux_arm64_build: { $eval: as_slugid("linux-arm64-cpu-opt") }
-        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_arm64_build}/artifacts/public
-        DEEPSPEECH_NODEJS: https://community-tc.services.mozilla.com/api/queue/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pbmm
@@ -52,7 +50,7 @@ then:
       - $let:
           extraSystemSetup: { $eval: strip(str(build.system_setup)) }
         in: >
-          apt-get -qq update && apt-get -qq -y install git gnupg pixz sox sudo wget libatlas3-base libopenblas-base xxd && ${extraSystemSetup} &&
+          apt-get -qq update && apt-get -qq -y install curl python-simplejson git gnupg pixz sox sudo wget libatlas3-base libopenblas-base xxd && ${extraSystemSetup} &&
           adduser --system --home ${system.homedir.linux} ${system.username} &&
           cd ${system.homedir.linux} &&
           echo -e "#!/bin/bash\nset -xe\n env && id && mkdir ~/DeepSpeech/ && git clone --quiet ${event.head.repo.url} ~/DeepSpeech/ds/ && cd ~/DeepSpeech/ds && git checkout --quiet ${event.head.sha}" > /tmp/clone.sh && chmod +x /tmp/clone.sh &&

diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml
@@ -37,11 +37,9 @@ then:
         training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
         darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
         darwin_amd64_tflite: { $eval: as_slugid("darwin-amd64-tflite-opt") }
-        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${darwin_amd64_build}/artifacts/public
         DEEPSPEECH_ARTIFACTS_TFLITE_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${darwin_amd64_tflite}/artifacts/public
-        DEEPSPEECH_NODEJS: https://community-tc.services.mozilla.com/api/queue/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pbmm

diff --git a/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "darwin-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py35m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   docker_image: "ubuntu:16.04"
   dependencies:
-    - "node-package-cpu"
+    - "linux-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py35m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml
@@ -1,7 +1,7 @@
 build:
   template_file: test-win-opt-base.tyml
   dependencies:
-    - "node-package-cpu"
+    - "win-amd64-cpu-opt"
     - "test-training_upstream-linux-amd64-py35m-opt"
   system_setup:
     >

diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml
@@ -35,13 +35,11 @@ then:
         linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
         linux_amd64_tflite: { $eval: as_slugid("linux-amd64-tflite-opt") }
         linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }
-        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
       in:
         CONVERT_GRAPHDEF_MEMMAPPED: ${build.convert_graphdef}
         BENCHMARK_MODEL_BIN: ${build.benchmark_model_bin}
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_amd64_build}/artifacts/public
         DEEPSPEECH_ARTIFACTS_TFLITE_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_amd64_tflite}/artifacts/public
-        DEEPSPEECH_NODEJS: https://community-tc.services.mozilla.com/api/queue/v1/task/${node_package_cpu}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
         DEEPSPEECH_PROD_MODEL: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pb
         DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.11/output_graph.pbmm
@@ -57,7 +55,7 @@ then:
           extraSystemSetup: { $eval: strip(str(build.system_setup)) }
         in: >
           ${aptEc2Mirrors} &&
-          apt-get -qq update && apt-get -qq -y install git pixz sox sudo wget && ${extraSystemSetup} &&
+          apt-get -qq update && apt-get -qq -y install curl python-simplejson git pixz sox sudo wget && ${extraSystemSetup} &&
           adduser --system --home ${system.homedir.linux} ${system.username} &&
           cd ${system.homedir.linux} &&
           echo -e "#!/bin/bash\nset -xe\n env && id && mkdir ~/DeepSpeech/ && git clone --quiet ${event.head.repo.url} ~/DeepSpeech/ds/ && cd ~/DeepSpeech/ds && git checkout --quiet ${event.head.sha}" > /tmp/clone.sh && chmod +x /tmp/clone.sh &&