Trusty -> Xenial

2020-05-02 13:13:07 +02:00 · 2020-05-02 13:13:07 +02:00 · eca69d1c84
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@ -45,7 +45,7 @@ tasks:
        - "--login"
        - "-cxe"
        - >
-          echo "deb http://archive.ubuntu.com/ubuntu/ trusty-updates main" > /etc/apt/sources.list.d/trusty-updates.list &&
+          echo "deb http://archive.ubuntu.com/ubuntu/ xenial-updates main" > /etc/apt/sources.list.d/xenial-updates.list &&
          apt-get -qq update && apt-get -qq -y install git python3-pip curl sudo &&
          adduser --system --home /home/build-user build-user &&
          cd /home/build-user/ &&
--- a/native_client/BUILD
+++ b/native_client/BUILD
@ -122,8 +122,8 @@ tf_cc_shared_object(
    linkopts = select({
        "//tensorflow:macos": [],
        "//tensorflow:linux_x86_64": LINUX_LINKOPTS,
-        "//tensorflow:rpi3": LINUX_LINKOPTS + ["-l:libstdc++.a"],
-        "//tensorflow:rpi3-armv8": LINUX_LINKOPTS + ["-l:libstdc++.a"],
+        "//tensorflow:rpi3": LINUX_LINKOPTS,
+        "//tensorflow:rpi3-armv8": LINUX_LINKOPTS,
        "//tensorflow:windows": [],
        "//conditions:default": [],
    }) + tflite_linkopts(),
--- a/native_client/definitions.mk
+++ b/native_client/definitions.mk
@ -65,7 +65,7 @@ ifeq ($(TARGET),rpi3)
 TOOLCHAIN   ?= ${TFDIR}/bazel-$(shell basename "${TFDIR}")/external/LinaroArmGcc72/bin/arm-linux-gnueabihf-
 RASPBIAN    ?= $(abspath $(NC_DIR)/../multistrap-raspbian-buster)
 CFLAGS      := -march=armv7-a -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -D_GLIBCXX_USE_CXX11_ABI=0 --sysroot $(RASPBIAN)
-CXXFLAGS    := $(CXXFLAGS)
+CXXFLAGS    := $(CFLAGS)
 LDFLAGS     := -Wl,-rpath-link,$(RASPBIAN)/lib/arm-linux-gnueabihf/ -Wl,-rpath-link,$(RASPBIAN)/usr/lib/arm-linux-gnueabihf/

 SOX_CFLAGS  := -I$(RASPBIAN)/usr/include
--- a/native_client/javascript/package.json.in
+++ b/native_client/javascript/package.json.in
@ -35,7 +35,7 @@
      "node-pre-gyp": "0.15.x",
      "argparse": "1.0.x",
      "sox-stream": "2.0.x",
-      "memory-stream": "0.0.3",
+      "memory-stream": "1.0.x",
      "node-wav": "0.0.2"
    },
    "devDependencies": {
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@ -1,27 +1,27 @@
 python:
-  packages_trusty:
+  packages_xenial:
    apt: 'make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libpng-dev libsox-dev libmagic-dev libgsm1-dev libltdl-dev'
  packages_buster:
    apt: 'python3-virtualenv python3-setuptools python3-pip python3-wheel python3-pkg-resources'
  packages_docs_bionic:
    apt: 'python3 python3-pip zip doxygen'
 training:
-  packages_trusty:
+  packages_xenial:
    apt: 'libopus0'
 tensorflow:
-  packages_trusty:
+  packages_xenial:
    apt: 'make build-essential gfortran git libblas-dev liblapack-dev libsox-dev libmagic-dev libgsm1-dev libltdl-dev libpng-dev python zlib1g-dev'
 java:
-  packages_trusty:
+  packages_xenial:
    apt: 'apt-get -qq -y install curl software-properties-common wget unzip && add-apt-repository --yes ppa:openjdk-r/ppa && apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq -y --force-yes install openjdk-8-jdk && java -version && update-ca-certificates -f'
 electronjs:
  packages_xenial:
    apt: 'libatk1.0-0 libatk-bridge2.0-0 libcairo2 libcups2 libdbus-1-3 libgdk-pixbuf2.0-0 libgtk-3-0 libnspr4 libnss3 libpango-1.0-0 libpangocairo-1.0-0 libx11-xcb1 libxcomposite1 libxcursor1 libxdamage1 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 xvfb'
 nodejs:
-  packages_trusty:
+  packages_xenial:
    apt: 'nodejs sox'
    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 trusty 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 -'
  packages_xenial:
    apt: 'nodejs sox'
    apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences'
--- a/taskcluster/android-cache-arm64-v8a-android-24.yml
+++ b/taskcluster/android-cache-arm64-v8a-android-24.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.arm64_v8a.android_24.url}
    artifact_namespace: ${system.android_cache.arm64_v8a.android_24.namespace}
--- a/taskcluster/android-cache-arm64-v8a-android-25.yml
+++ b/taskcluster/android-cache-arm64-v8a-android-25.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.arm64_v8a.android_25.url}
    artifact_namespace: ${system.android_cache.arm64_v8a.android_25.namespace}
--- a/taskcluster/android-cache-armeabi-v7a-android-24.yml
+++ b/taskcluster/android-cache-armeabi-v7a-android-24.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.armeabi_v7a.android_24.url}
    artifact_namespace: ${system.android_cache.armeabi_v7a.android_24.namespace}
--- a/taskcluster/android-cache-armeabi-v7a-android-25.yml
+++ b/taskcluster/android-cache-armeabi-v7a-android-25.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.armeabi_v7a.android_25.url}
    artifact_namespace: ${system.android_cache.armeabi_v7a.android_25.namespace}
--- a/taskcluster/android-cache-sdk-android-27.yml
+++ b/taskcluster/android-cache-sdk-android-27.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.sdk.android_27.url}
    artifact_namespace: ${system.android_cache.sdk.android_27.namespace}
--- a/taskcluster/android-cache-x86_64-android-24.yml
+++ b/taskcluster/android-cache-x86_64-android-24.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.x86_64.android_24.url}
    artifact_namespace: ${system.android_cache.x86_64.android_24.namespace}
--- a/taskcluster/android-cache-x86_64-android-25.yml
+++ b/taskcluster/android-cache-x86_64-android-25.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.x86_64.android_25.url}
    artifact_namespace: ${system.android_cache.x86_64.android_25.namespace}
--- a/taskcluster/android-cache-x86_64-android-26.yml
+++ b/taskcluster/android-cache-x86_64-android-26.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.x86_64.android_26.url}
    artifact_namespace: ${system.android_cache.x86_64.android_26.namespace}
--- a/taskcluster/android-cache-x86_64-android-28.yml
+++ b/taskcluster/android-cache-x86_64-android-28.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.x86_64.android_28.url}
    artifact_namespace: ${system.android_cache.x86_64.android_28.namespace}
--- a/taskcluster/android-cache-x86_64-android-29.yml
+++ b/taskcluster/android-cache-x86_64-android-29.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.x86_64.android_29.url}
    artifact_namespace: ${system.android_cache.x86_64.android_29.namespace}
--- a/taskcluster/android-cache-x86_64-android-30.yml
+++ b/taskcluster/android-cache-x86_64-android-30.yml
@ -2,7 +2,7 @@ build:
  template_file: generic_tc_caching-linux-opt-base.tyml
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  cache:
    artifact_url: ${system.android_cache.x86_64.android_30.url}
    artifact_namespace: ${system.android_cache.x86_64.android_30.namespace}
--- a/taskcluster/android-java-opt.yml
+++ b/taskcluster/android-java-opt.yml
@ -13,7 +13,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.android-apk.${event.head.sha}"
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  tensorflow: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.c29895fba1b9f9f48e2e54eefb024c69aa333473.android-armv7/artifacts/public/home.tar.xz"
  gradle_cache:
    url: ${system.gradle_cache.url}
--- a/taskcluster/generic_tc_caching-linux-opt-base.tyml
+++ b/taskcluster/generic_tc_caching-linux-opt-base.tyml
@ -25,7 +25,7 @@ payload:
        taskIndexExpire: { $fromNow: '6 months' }
      in: >
        (apt-get -qq -y remove --purge ubuntu-advantage-tools || true) &&
-        apt-get -qq update && apt-get -qq -y install curl git && ${extraSystemSetup};
+        apt-get -qq update && apt-get -qq -y install curl git sudo && ${extraSystemSetup};
        cache_artifact=`curl -sSIL -o /dev/null -w "%{http_code}" ${build.cache.artifact_url}` &&
        if [ "$cache_artifact" != "200" ]; then
          adduser --system --home ${system.homedir.linux} ${system.username} && cd ${system.homedir.linux}/ &&
--- a/taskcluster/gradle-cache.yml
+++ b/taskcluster/gradle-cache.yml
@ -5,7 +5,7 @@ build:
    artifact_namespace: ${system.gradle_cache.namespace}
  system_setup:
    >
-      ${java.packages_trusty.apt}
+      ${java.packages_xenial.apt}
  scripts:
    build: "taskcluster/gradle-build.sh"
    package: "taskcluster/gradle-package.sh"
--- a/taskcluster/linux-amd64-cpu-opt.yml
+++ b/taskcluster/linux-amd64-cpu-opt.yml
@ -10,7 +10,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.cpu.${event.head.sha}"
  system_setup:
    >
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  tensorflow: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.c29895fba1b9f9f48e2e54eefb024c69aa333473.cpu/artifacts/public/home.tar.xz"
  scripts:
--- a/taskcluster/linux-amd64-ctc-opt.yml
+++ b/taskcluster/linux-amd64-ctc-opt.yml
@ -10,7 +10,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.cpu-ctc.${event.head.sha}"
  system_setup:
    >
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  tensorflow: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.c29895fba1b9f9f48e2e54eefb024c69aa333473.cpu/artifacts/public/home.tar.xz"
  scripts:
--- a/taskcluster/linux-amd64-gpu-opt.yml
+++ b/taskcluster/linux-amd64-gpu-opt.yml
@ -10,7 +10,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.gpu.${event.head.sha}"
  system_setup:
    >
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  tensorflow: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.c29895fba1b9f9f48e2e54eefb024c69aa333473.gpu/artifacts/public/home.tar.xz"
  maxRunTime: 14400
--- a/taskcluster/linux-amd64-tflite-opt.yml
+++ b/taskcluster/linux-amd64-tflite-opt.yml
@ -10,7 +10,7 @@ build:
    - "index.project.deepspeech.deepspeech.native_client.tflite.${event.head.sha}"
  system_setup:
    >
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  tensorflow: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.2.c29895fba1b9f9f48e2e54eefb024c69aa333473.cpu/artifacts/public/home.tar.xz"
  scripts:
--- a/taskcluster/linux-arm64-cpu-opt.yml
+++ b/taskcluster/linux-arm64-cpu-opt.yml
@ -14,7 +14,7 @@ build:
      apt-get -qq -y install gdebi git pixz &&
      wget http://mirrors.kernel.org/ubuntu/pool/universe/m/multistrap/multistrap_2.2.0ubuntu2_all.deb -O /tmp/multistrap_2.2.0ubuntu2_all.deb &&
      echo "y" | gdebi /tmp/multistrap_2.2.0ubuntu2_all.deb &&
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  system_config:
    >
--- a/taskcluster/linux-opt-base.tyml
+++ b/taskcluster/linux-opt-base.tyml
@ -44,7 +44,7 @@ then:
          extraSystemConfig: { $eval: strip(str(build.system_config)) }
        in: >
          adduser --system --home ${system.homedir.linux} ${system.username} &&
-          apt-get -qq update && apt-get -qq -y install ${tensorflow.packages_trusty.apt} pixz pkg-config realpath sudo unzip wget zip && ${extraSystemSetup} &&
+          apt-get -qq update && apt-get -qq -y install ${tensorflow.packages_xenial.apt} pixz pkg-config realpath sudo unzip wget zip && ${extraSystemSetup} &&
          cd ${system.homedir.linux}/ &&
          echo -e "#!/bin/bash\nset -xe\n env && id && (wget -O - $TENSORFLOW_BUILD_ARTIFACT | pixz -d | tar -C ${system.homedir.linux}/ -xf - ) && git clone --quiet ${event.head.repo.url} ~/DeepSpeech/ds/ && cd ~/DeepSpeech/ds && git checkout --quiet ${event.head.sha} && ln -s ~/DeepSpeech/ds/native_client/ ~/DeepSpeech/tf/native_client && mkdir -p ${system.homedir.linux}/.cache/node-gyp/ && wget -O - ${system.node_gyp_cache.url} | tar -C ${system.homedir.linux}/.cache/node-gyp/ -xzf - && mkdir -p ${system.homedir.linux}/pyenv-root/ && wget -O - ${system.pyenv.linux.url} | tar -C ${system.homedir.linux}/pyenv-root/ -xzf - && if [ ! -z "${build.gradle_cache.url}" ]; then wget -O - ${build.gradle_cache.url} | tar -C ${system.homedir.linux}/ -xzf - ; fi && if [ ! -z "${build.android_cache.url}" ]; then wget -O - ${build.android_cache.url} | tar -C ${system.homedir.linux}/ -xzf - ; fi;" > /tmp/clone.sh && chmod +x /tmp/clone.sh &&
          sudo -H -u ${system.username} /bin/bash /tmp/clone.sh && ${extraSystemConfig} &&
--- a/taskcluster/linux-rpi3-cpu-opt.yml
+++ b/taskcluster/linux-rpi3-cpu-opt.yml
@ -14,7 +14,7 @@ build:
      apt-get -qq -y install gdebi git pixz &&
      wget http://mirrors.kernel.org/ubuntu/pool/universe/m/multistrap/multistrap_2.2.0ubuntu2_all.deb -O /tmp/multistrap_2.2.0ubuntu2_all.deb &&
      echo "y" | gdebi /tmp/multistrap_2.2.0ubuntu2_all.deb &&
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  system_config:
    >
--- a/taskcluster/node-package-cpu.yml
+++ b/taskcluster/node-package-cpu.yml
@ -8,7 +8,7 @@ build:
    - "win-amd64-cpu-opt"
  system_setup:
    >
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  scripts:
    build: "taskcluster/node-build.sh"
--- a/taskcluster/node-package-gpu.yml
+++ b/taskcluster/node-package-gpu.yml
@ -5,7 +5,7 @@ build:
    - "win-amd64-gpu-opt"
  system_setup:
    >
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  scripts:
    build: "taskcluster/node-build.sh --cuda"
--- a/taskcluster/node-package-tflite.yml
+++ b/taskcluster/node-package-tflite.yml
@ -6,7 +6,7 @@ build:
    - "win-amd64-tflite-opt"
  system_setup:
    >
-      ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning}
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning}
      && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
  scripts:
    build: "taskcluster/node-build.sh --tflite"
--- a/taskcluster/pyenv-linux-amd64.yml
+++ b/taskcluster/pyenv-linux-amd64.yml
@ -5,7 +5,7 @@ build:
    artifact_namespace: "${system.pyenv.linux.namespace}"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install python-yaml ${python.packages_trusty.apt} wget
+      apt-get -qq update && apt-get -qq -y install python-yaml ${python.packages_xenial.apt} wget
  scripts:
    build: "taskcluster/pyenv-build.sh"
    package: "taskcluster/pyenv-package.sh"
--- a/taskcluster/swig-linux-amd64.yml
+++ b/taskcluster/swig-linux-amd64.yml
@ -1,6 +1,6 @@
 build:
  template_file: generic_tc_caching-linux-opt-base.tyml
-  docker_image: "ubuntu:14.04"
+  docker_image: "ubuntu:16.04"
  build_or_cache:
    repo: "${system.swig.repo}"
    sha: "${system.swig.sha1}"
--- a/taskcluster/test-armbian-opt-base.tyml
+++ b/taskcluster/test-armbian-opt-base.tyml
@ -19,7 +19,7 @@ then:

  payload:
    maxRunTime: { $eval: to_int(build.maxRunTime) }
-    image: "arm64v8/debian:buster-20190812"
+    image: "arm64v8/debian:buster-20200422"

    env:
      $let:
@ -42,7 +42,7 @@ then:
      - $let:
          extraSystemSetup: { $eval: strip(str(build.system_setup)) }
        in: >
-          apt-get -qq update && apt-get -qq -y install curl python-simplejson 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 && update-ca-certificates --fresh && ${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 &&
--- a/taskcluster/test-augmentations-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-augmentations-linux-amd64-py36m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-augmentation-tests.sh 3.6.10:m"
  metadata:
--- a/taskcluster/test-linux-opt-tag-base.tyml
+++ b/taskcluster/test-linux-opt-tag-base.tyml
@ -44,7 +44,6 @@ then:
      - $let:
          extraSystemSetup: { $eval: strip(str(build.system_setup)) }
        in: >
-          ${aptEc2Mirrors} &&
          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} &&
--- a/taskcluster/test-raspbian-opt-base.tyml
+++ b/taskcluster/test-raspbian-opt-base.tyml
@ -19,7 +19,7 @@ then:

  payload:
    maxRunTime: { $eval: to_int(build.maxRunTime) }
-    image: "resin/rpi-raspbian:buster-20190121"
+    image: "balenalib/rpi-raspbian:buster-20200429"

    env:
      $let:
@ -42,7 +42,7 @@ then:
      - $let:
          extraSystemSetup: { $eval: strip(str(build.system_setup)) }
        in: >
-          apt-get -qq update && apt-get -qq -y install curl python-simplejson git pixz sox wget libatlas3-base xxd && ${extraSystemSetup} &&
+          apt-get -qq update && apt-get -qq -y install curl python-simplejson git pixz sox wget libatlas3-base xxd && update-ca-certificates --fresh && ${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 &&
--- a/taskcluster/test-training-extra_16k-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training-extra_16k-linux-amd64-py35m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.5.8:m 16k"
  metadata:
--- a/taskcluster/test-training-extra_16k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-extra_16k-linux-amd64-py36m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.6.10:m 16k"
  metadata:
--- a/taskcluster/test-training-extra_16k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-extra_16k-linux-amd64-py37m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.7.6:m 16k"
  metadata:
--- a/taskcluster/test-training-extra_8k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-extra_8k-linux-amd64-py36m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.6.10:m 8k"
  metadata:
--- a/taskcluster/test-training-extra_8k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-extra_8k-linux-amd64-py37m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-extra-tests.sh 3.7.6:m 8k"
  metadata:
--- a/taskcluster/test-training-pypi_16k-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training-pypi_16k-linux-amd64-py35m-opt.yml
@ -7,7 +7,7 @@ build:
  ref_match: "refs/tags/"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.8:m 16k --pypi"
  metadata:
--- a/taskcluster/test-training-pypi_16k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-pypi_16k-linux-amd64-py36m-opt.yml
@ -7,7 +7,7 @@ build:
  ref_match: "refs/tags/"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.10:m 16k --pypi"
  metadata:
--- a/taskcluster/test-training-pypi_16k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-pypi_16k-linux-amd64-py37m-opt.yml
@ -7,7 +7,7 @@ build:
  ref_match: "refs/tags/"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.7.6:m 16k --pypi"
  metadata:
--- a/taskcluster/test-training-pypi_8k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-pypi_8k-linux-amd64-py36m-opt.yml
@ -7,7 +7,7 @@ build:
  ref_match: "refs/tags/"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.10:m 8k --pypi"
  metadata:
--- a/taskcluster/test-training-pypi_8k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-pypi_8k-linux-amd64-py37m-opt.yml
@ -7,7 +7,7 @@ build:
  ref_match: "refs/tags/"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.7.6:m 8k  --pypi"
  metadata:
--- a/taskcluster/test-training-unittests_8k-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training-unittests_8k-linux-amd64-py35m-opt.yml
@ -4,7 +4,7 @@ build:
      - "linux-amd64-ctc-opt"
    system_setup:
      >
-        apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+        apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
    args:
      tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.5.8:m"
    metadata:
--- a/taskcluster/test-training-unittests_8k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training-unittests_8k-linux-amd64-py36m-opt.yml
@ -4,10 +4,10 @@ build:
      - "linux-amd64-ctc-opt"
    system_setup:
      >
-        apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+        apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
    args:
      tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.6.10:m"
    metadata:
      name: "DeepSpeech on Linux AMD64 CPU training unittests using Python 3.6"
      description: "Training unittests DeepSpeech LDC93S1 model for Linux/AMD64 using Python 3.6, for CPU only, and optimized version"
- 
+ 
--- a/taskcluster/test-training-unittests_8k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training-unittests_8k-linux-amd64-py37m-opt.yml
@ -4,7 +4,7 @@ build:
      - "linux-amd64-ctc-opt"
    system_setup:
      >
-        apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+        apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
    args:
      tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-unittests.sh 3.7.6:m"
    metadata:
--- a/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.8:m 16k"
  metadata:
--- a/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.10:m 16k"
  metadata:
--- a/taskcluster/test-training_16k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training_16k-linux-amd64-py37m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.7.6:m 16k"
  metadata:
--- a/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.10:m 8k"
  metadata:
--- a/taskcluster/test-training_8k-linux-amd64-py37m-opt.yml
+++ b/taskcluster/test-training_8k-linux-amd64-py37m-opt.yml
@ -4,7 +4,7 @@ build:
    - "linux-amd64-ctc-opt"
  system_setup:
    >
-      apt-get -qq update && apt-get -qq -y install ${training.packages_trusty.apt}
+      apt-get -qq update && apt-get -qq -y install ${training.packages_xenial.apt}
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.7.6:m 8k"
  metadata: