Switch training model dependency to upstream-based

Alexandre Lissy · Alexandre Lissy · commit 30857cc28865 · 2018-01-31T16:54:37.000+01:00
Currently, self-built Python package is not able to work, likely because
of the visibility of symbols. Let's switch to upstream TensorFlow for
now.
diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml
@@ -29,5 +29,4 @@ build:
     package: ''
   args:
     tests_cmdline: ''
-  python_wheel: ''
   deepspeech_pkg_name: ''
diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml
@@ -36,7 +36,7 @@ payload:
 
   env:
     $let:
-      training: { $eval: as_slugid("test-training-linux-amd64-py27-opt") }
+      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
     in:
       TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
       SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph}
diff --git a/taskcluster/linux-amd64-cpu-aot_test-opt.yml b/taskcluster/linux-amd64-cpu-aot_test-opt.yml
@@ -5,7 +5,7 @@ build:
     - "pull_request.reopened"
   template_file: linux-opt-base.tyml
   dependencies:
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu/artifacts/public/home.tar.xz"
   summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.7d79b8f6422e5b7e0ba82504c500a86756c44a62.cpu/artifacts/public/summarize_graph"
   system_setup:
diff --git a/taskcluster/linux-opt-base.tyml b/taskcluster/linux-opt-base.tyml
@@ -33,7 +33,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
       in:
         TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
         SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph}
diff --git a/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml b/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt} zip
diff --git a/taskcluster/test-benchmark-linux-amd64-opt.yml b/taskcluster/test-benchmark-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt} zip
diff --git a/taskcluster/test-cpp-darwin-amd64-opt.yml b/taskcluster/test-cpp-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
diff --git a/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml b/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh --aot"
   metadata:
diff --git a/taskcluster/test-cpp-linux-amd64-opt.yml b/taskcluster/test-cpp-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh"
   metadata:
diff --git a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests-prod.sh"
   metadata:
diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml
@@ -30,11 +30,10 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
         darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
         node_package: { $eval: as_slugid("node-package") }
       in:
-        TENSORFLOW_WHEEL: ${build.python_wheel}
         DEEPSPEECH_ARTIFACTS_ROOT: https://queue.taskcluster.net/v1/task/${darwin_amd64_build}/artifacts/public
         DEEPSPEECH_NODEJS: https://queue.taskcluster.net/v1/task/${node_package}/artifacts/public
         DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb
diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml
@@ -31,13 +31,12 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
         linux_amd64_aot_test: { $eval: as_slugid("linux-amd64-cpu-aot_test-opt") }
         linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
         linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }
         node_package: { $eval: as_slugid("node-package") }
       in:
-        TENSORFLOW_WHEEL: ${build.python_wheel}
         DEEPSPEECH_ARTIFACTS_ROOT: https://queue.taskcluster.net/v1/task/${linux_amd64_build}/artifacts/public
         DEEPSPEECH_PYTHON_PACKAGE: https://queue.taskcluster.net/v1/task/${linux_amd64_build}/artifacts/public/${build.deepspeech_pkg_name}
         DEEPSPEECH_NODEJS: https://queue.taskcluster.net/v1/task/${node_package}/artifacts/public
diff --git a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_4} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_5} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_6} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_7} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_8} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_9} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-python_27-darwin-amd64-opt.yml b/taskcluster/test-python_27-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 2.7.13"
   metadata:
diff --git a/taskcluster/test-python_27-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_27-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_27-linux-amd64-opt.yml b/taskcluster/test-python_27-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_34-darwin-amd64-opt.yml b/taskcluster/test-python_34-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   args:
     tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.4.6"
   metadata:
diff --git a/taskcluster/test-python_34-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_34-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_34-linux-amd64-opt.yml b/taskcluster/test-python_34-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
diff --git a/taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml
diff --git a/taskcluster/test-python_35-darwin-amd64-opt.yml b/taskcluster/test-python_35-darwin-amd64-opt.yml
diff --git a/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml
diff --git a/taskcluster/test-python_35-linux-amd64-opt.yml b/taskcluster/test-python_35-linux-amd64-opt.yml
diff --git a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
diff --git a/taskcluster/test-python_36-darwin-amd64-opt.yml b/taskcluster/test-python_36-darwin-amd64-opt.yml
diff --git a/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml
diff --git a/taskcluster/test-python_36-linux-amd64-opt.yml b/taskcluster/test-python_36-linux-amd64-opt.yml
diff --git a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml-disabled b/taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml-disabled
diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml-disabled b/taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml-disabled
diff --git a/taskcluster/test-training-linux-amd64-py27-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py27-opt.yml-disabled
diff --git a/taskcluster/test-training-linux-amd64-py34-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py34-opt.yml-disabled
diff --git a/taskcluster/test-training-linux-amd64-py35-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py35-opt.yml-disabled
diff --git a/taskcluster/test-training-linux-amd64-py36-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py36-opt.yml-disabled

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ build:`
`2`	`2`	`template_file: test-linux-opt-base.tyml`
`3`	`3`	`dependencies:`
`4`	`4`	`- "linux-amd64-cpu-aot_test-opt"`
`5`		`- - "test-training-linux-amd64-py27-opt"`
	`5`	`+ - "test-training_upstream-linux-amd64-py27-opt"`
`6`	`6`	`system_setup:`
`7`	`7`	`>`
`8`	`8`	`apt-get -qq -y install ${python.packages.apt} zip`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ build:`
`2`	`2`	`template_file: test-darwin-opt-base.tyml`
`3`	`3`	`dependencies:`
`4`	`4`	`- "darwin-amd64-cpu-opt"`
`5`		`- - "test-training-linux-amd64-py27-opt"`
	`5`	`+ - "test-training_upstream-linux-amd64-py27-opt"`
`6`	`6`	`system_setup:`
`7`	`7`	`>`
`8`	`8`	`${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}`