Merge pull request #2834 from lissyx/new-android

Add CI for Android 8.0, 9.0 and 10.0

taskcluster/.shared.yml

@@ -83,6 +83,18 @@ system:
       android_25:
         url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-25.4/artifacts/public/android_cache.tar.gz'
         namespace: 'project.deepspeech.android_cache.x86_64.android-25.4'
+      android_26:
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-26.0/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-26.0'
+      android_27:
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-27.0/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-27.0'
+      android_28:
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-28.0/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-28.0'
+      android_29:
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-29.0/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-29.0'
     sdk:
       android_27:
         url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.sdk.android-27.4/artifacts/public/android_cache.tar.gz'

taskcluster/android-cache-x86_64-android-26.yml

@@ -0,0 +1,14 @@
+build:
+  template_file: android_cache-opt-base.tyml
+  system_setup:
+    >
+      ${java.packages_trusty.apt}
+  cache:
+    url: ${system.android_cache.x86_64.android_26.url}
+    namespace: ${system.android_cache.x86_64.android_26.namespace}
+  scripts:
+    build: "taskcluster/android_cache-build.sh x86_64 android-26"
+    package: "taskcluster/android_cache-package.sh"
+  metadata:
+    name: "Builds Android cache x86_64 / android-26"
+    description: "Setup an Android SDK / emulator cache for Android / x86_64 android-26"

taskcluster/android-cache-x86_64-android-28.yml

@@ -0,0 +1,14 @@
+build:
+  template_file: android_cache-opt-base.tyml
+  system_setup:
+    >
+      ${java.packages_trusty.apt}
+  cache:
+    url: ${system.android_cache.x86_64.android_28.url}
+    namespace: ${system.android_cache.x86_64.android_28.namespace}
+  scripts:
+    build: "taskcluster/android_cache-build.sh x86_64 android-28"
+    package: "taskcluster/android_cache-package.sh"
+  metadata:
+    name: "Builds Android cache x86_64 / android-28"
+    description: "Setup an Android SDK / emulator cache for Android / x86_64 android-28"

taskcluster/android-cache-x86_64-android-29.yml

@@ -0,0 +1,14 @@
+build:
+  template_file: android_cache-opt-base.tyml
+  system_setup:
+    >
+      ${java.packages_trusty.apt}
+  cache:
+    url: ${system.android_cache.x86_64.android_29.url}
+    namespace: ${system.android_cache.x86_64.android_29.namespace}
+  scripts:
+    build: "taskcluster/android_cache-build.sh x86_64 android-29"
+    package: "taskcluster/android_cache-package.sh"
+  metadata:
+    name: "Builds Android cache x86_64 / android-29"
+    description: "Setup an Android SDK / emulator cache for Android / x86_64 android-29"

taskcluster/test-apk-android-26-x86_64-opt.yml

@@ -1,12 +1,21 @@
-# disabled because too intermittent to be reliable until we have some KVM-backed infra
 build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
     - "test-training_16k-linux-amd64-py36m-opt"
+    - "swig-linux-amd64"
+    - "gradle-cache"
+    - "android-cache-x86_64-android-26"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python
+  cache:
+    url: ${system.android_cache.x86_64.android_26.url}
+    namespace: ${system.android_cache.x86_64.android_26.namespace}
+  gradle_cache:
+    url: ${system.gradle_cache.url}
+    namespace: ${system.gradle_cache.namespace}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-26"
   metadata:

taskcluster/test-apk-android-28-x86_64-opt.yml

@@ -1,12 +1,21 @@
-# disabled because too intermittent to be reliable until we have some KVM-backed infra
 build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
     - "test-training_16k-linux-amd64-py36m-opt"
+    - "swig-linux-amd64"
+    - "gradle-cache"
+    - "android-cache-x86_64-android-28"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python
+  cache:
+    url: ${system.android_cache.x86_64.android_28.url}
+    namespace: ${system.android_cache.x86_64.android_28.namespace}
+  gradle_cache:
+    url: ${system.gradle_cache.url}
+    namespace: ${system.gradle_cache.namespace}
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-28"
   metadata:

taskcluster/test-apk-android-29-x86_64-opt.yml

@@ -0,0 +1,23 @@
+build:
+  template_file: test-android-opt-base.tyml
+  dependencies:
+    - "android-x86_64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+    - "swig-linux-amd64"
+    - "gradle-cache"
+    - "android-cache-x86_64-android-29"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install curl make python
+  cache:
+    url: ${system.android_cache.x86_64.android_29.url}
+    namespace: ${system.android_cache.x86_64.android_29.namespace}
+  gradle_cache:
+    url: ${system.gradle_cache.url}
+    namespace: ${system.gradle_cache.namespace}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-29"
+  metadata:
+    name: "DeepSpeech Android 10.0 x86_64 Google Pixel APK/Java tests"
+    description: "Testing DeepSpeech APK/Java for Android 10.0 x86_64 Google Pixel, optimized version"