Bug 1442330: Remove android old-id builds r=jlorenzo
authorChris AtLee <catlee@mozilla.com>
Thu, 29 Mar 2018 17:19:33 -0400
changeset 411555 8f3d33f7c72babbf232f1938e982d4dd5f54f142
parent 411554 f249c97b9d353223ed0b660822759018470b7395
child 411556 e220521c6ff6ff9a45e19b3917ba95e678fd9932
push id101686
push useraciure@mozilla.com
push dateTue, 03 Apr 2018 21:59:31 +0000
treeherdermozilla-inbound@8d846598d35d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlorenzo
bugs1442330
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1442330: Remove android old-id builds r=jlorenzo MozReview-Commit-ID: 9o3iXM5oHQM
mobile/android/branding/nightly-old-id/configure.sh
mobile/android/branding/nightly-old-id/content/about.png
mobile/android/branding/nightly-old-id/content/favicon32.png
mobile/android/branding/nightly-old-id/content/favicon64.png
mobile/android/branding/nightly-old-id/content/jar.mn
mobile/android/branding/nightly-old-id/content/moz.build
mobile/android/branding/nightly-old-id/locales/en-US/brand.dtd
mobile/android/branding/nightly-old-id/locales/en-US/brand.properties
mobile/android/branding/nightly-old-id/locales/jar.mn
mobile/android/branding/nightly-old-id/locales/moz.build
mobile/android/branding/nightly-old-id/moz.build
mobile/android/branding/nightly-old-id/res/drawable-hdpi/icon.png
mobile/android/branding/nightly-old-id/res/drawable-hdpi/large_icon.png
mobile/android/branding/nightly-old-id/res/drawable-nodpi/firstrun_welcome.png
mobile/android/branding/nightly-old-id/res/drawable-xhdpi/icon.png
mobile/android/branding/nightly-old-id/res/drawable-xhdpi/large_icon.png
mobile/android/branding/nightly-old-id/res/drawable-xxhdpi/icon.png
mobile/android/branding/nightly-old-id/res/drawable-xxhdpi/large_icon.png
mobile/android/branding/nightly-old-id/res/drawable-xxxhdpi/icon.png
mobile/android/config/mozconfigs/android-api-16/nightly-old-id
mobile/android/config/mozconfigs/android-x86/nightly-old-id
python/mozrelease/mozrelease/platforms.py
taskcluster/ci/build/android.yml
taskcluster/ci/upload-symbols/kind.yml
taskcluster/taskgraph/loader/push_apk.py
taskcluster/taskgraph/target_tasks.py
taskcluster/taskgraph/transforms/beetmover.py
taskcluster/taskgraph/transforms/release_deps.py
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_old_id.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_old_id.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
deleted file mode 100644
--- a/mobile/android/branding/nightly-old-id/configure.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOZ_APP_DISPLAYNAME=Nightly
-ANDROID_PACKAGE_NAME=org.mozilla.fennec
-MOZ_UPDATER=1
-MOZ_ANDROID_ANR_REPORTER=1
-MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
-MOZ_ANDROID_GCM_SENDERID=965234145045
-MOZ_MMA_GCM_SENDERID=242693410970
deleted file mode 100644
index 2ca32a355fcdd8161f0f7bd6b910da36301e192e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 23830c03fcd5775202e61c6b98ffd3e98a433a37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d2214dcefe9a4f0aa95179bafca8b727ee686301..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/branding/nightly-old-id/content/jar.mn
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-chrome.jar:
-% content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png                     (about.png)
-  content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
deleted file mode 100644
--- a/mobile/android/branding/nightly-old-id/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/branding/nightly-old-id/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  brandShortName  "Nightly">
-<!ENTITY  brandFullName   "Mozilla Nightly">
-<!ENTITY  vendorShortName "Mozilla">
-
-<!ENTITY  brandPocket     "Pocket">
deleted file mode 100644
--- a/mobile/android/branding/nightly-old-id/locales/en-US/brand.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-brandShortName=Nightly
-brandFullName=Mozilla Nightly
deleted file mode 100644
--- a/mobile/android/branding/nightly-old-id/locales/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Nightly branding only exists in en-US
-  locale/branding/brand.dtd        (en-US/brand.dtd)
-  locale/branding/brand.properties (en-US/brand.properties)
deleted file mode 100644
--- a/mobile/android/branding/nightly-old-id/locales/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
deleted file mode 100644
--- a/mobile/android/branding/nightly-old-id/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['content', 'locales']
deleted file mode 100644
index 68e024ad268a55660e551cd4a6c5e67be2bf1d74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2ffc0ca909b93e2446d3cbc7dda51eb524af1197..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5c9093331cff70e3f3873af4d5937a2945fc2817..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0b5e1a175255ab488e045c6326e10d62a9b71c9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 12f87594365ce578c0b761f966bb600660ef6200..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1ee12f2419eb598a36570c2f6ff76d7df0faff69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 37ac9d067e92ee79fe97d221796d0942a0bdfaf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 9128552b390e2d9f3800d16c810effa06faf5c21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-api-16/nightly-old-id
+++ /dev/null
@@ -1,21 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-
-
-# Android
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --with-android-min-sdk=16
-ac_add_options --target=arm-linux-androideabi
-
-ac_add_options --with-branding=mobile/android/branding/nightly-old-id
-
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_MMA=1
-export MOZ_ANDROID_POCKET=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
deleted file mode 100644
--- a/mobile/android/config/mozconfigs/android-x86/nightly-old-id
+++ /dev/null
@@ -1,19 +0,0 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/common"
-
-# Warning: Before increasing the with-android-min-sdk value, please note several places in and out
-# of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
-# advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
-# If you think you can't handle the whole set of changes, please reach out to the Release
-# Engineering team.
-ac_add_options --target=i386-linux-android
-ac_add_options --with-android-min-sdk=16
-
-
-
-ac_add_options --with-branding=mobile/android/branding/nightly-old-id
-
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-export MOZ_ANDROID_POCKET=1
-
-. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/python/mozrelease/mozrelease/platforms.py
+++ b/python/mozrelease/mozrelease/platforms.py
@@ -1,20 +1,17 @@
 from __future__ import absolute_import
 
 # ftp -> update platform map
 update_platform_map = {
     "android": ["Android_arm-eabi-gcc3"],
     "android-api-11": ["Android_arm-eabi-gcc3"],
     "android-api-15": ["Android_arm-eabi-gcc3"],
-    "android-api-15-old-id": ["Android_arm-eabi-gcc3"],
     "android-api-16": ["Android_arm-eabi-gcc3"],
-    "android-api-16-old-id": ["Android_arm-eabi-gcc3"],
     "android-x86": ["Android_x86-gcc3"],
-    "android-x86-old-id": ["Android_x86-gcc3"],
     "android-aarch64": ["Android_aarch64-gcc3"],
     "linux-i686": ["Linux_x86-gcc3"],
     "linux-x86_64": ["Linux_x86_64-gcc3"],
     "mac": ["Darwin_x86_64-gcc3-u-i386-x86_64",  # The main platofrm
             "Darwin_x86-gcc3-u-i386-x86_64",
             # We don"t ship builds with these build targets, but some users
             # modify their builds in a way that has them report like these.
             # See bug 1071576 for details.
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -293,222 +293,16 @@ android-api-16-nightly/opt:
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
         - linux64-clang
         - linux64-rust-android
         - linux64-sccache
 
-android-x86-old-id/opt:
-    description: "Android 4.2 x86 Opt OldId"
-    index:
-        product: mobile
-        job-name: android-x86-old-id-opt
-    treeherder:
-        platform: android-4-2-x86-old-id/opt
-        symbol: B
-    worker-type: aws-provisioner-v1/gecko-{level}-b-android
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
-            # Increase the timeout because nsContentUtils.o takes a ridiculously
-            # long time to compile for x86 when using the current NDKs.  This
-            # will eventually get fixed, but for now we have to live with this.
-            # See https://github.com/android-ndk/ndk/issues/522 for more context.
-            SCCACHE_IDLE_TIMEOUT: "1500"
-        artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
-            - name: public/android/maven
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/officialWithGeckoBinariesNoMinApi/debug/geckoview_example-official-withGeckoBinaries-noMinApi-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets build multi-l10n update]
-        config:
-            - builds/releng_base_android_64_builds.py
-            - disable_signing.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: x86-old-id
-        tooltool-downloads: internal
-    run-on-projects: ['mozilla-central']
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-sccache
-
-android-x86-old-id-nightly/opt:
-    description: "Android 4.2 x86 OldId Nightly"
-    attributes:
-        nightly: true
-    index:
-        product: mobile
-        job-name: android-x86-old-id-opt
-        type: nightly
-    treeherder:
-        platform: android-4-2-x86-old-id/opt
-        symbol: N
-    worker-type: aws-provisioner-v1/gecko-{level}-b-android
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
-            # Increase the timeout because nsContentUtils.o takes a ridiculously
-            # long time to compile for x86 when using the current NDKs.  This
-            # will eventually get fixed, but for now we have to live with this.
-            # See https://github.com/android-ndk/ndk/issues/522 for more context.
-            SCCACHE_IDLE_TIMEOUT: "1500"
-        artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
-            - name: public/android/maven
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/officialWithGeckoBinariesNoMinApi/debug/geckoview_example-official-withGeckoBinaries-noMinApi-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets build multi-l10n update]
-        config:
-            - builds/releng_base_android_64_builds.py
-            - disable_signing.py
-            - taskcluster_nightly.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: x86-old-id
-        tooltool-downloads: internal
-    run-on-projects: ['mozilla-central']
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-sccache
-
-android-api-16-old-id/opt:
-    description: "Android 4.0 api-16+ Opt OldId"
-    index:
-        product: mobile
-        job-name: android-api-16-old-id-opt
-    treeherder:
-        platform: android-4-0-armv7-api16-old-id/opt
-        symbol: B
-    worker-type: aws-provisioner-v1/gecko-{level}-b-android
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-        artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
-            - name: public/android/maven
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/officialWithGeckoBinariesNoMinApi/debug/geckoview_example-official-withGeckoBinaries-noMinApi-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets build multi-l10n update]
-        config:
-            - builds/releng_base_android_64_builds.py
-            - disable_signing.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: api-16-old-id
-        tooltool-downloads: internal
-    run-on-projects: ['mozilla-central']
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-sccache
-
-android-api-16-old-id-nightly/opt:
-    description: "Android 4.0 api-16+ OldId Nightly"
-    attributes:
-        nightly: true
-    index:
-        product: mobile
-        job-name: android-api-16-old-id-opt
-        type: nightly-with-multi-l10n
-    treeherder:
-        platform: android-4-0-armv7-api16-old-id/opt
-        symbol: N
-    worker-type: aws-provisioner-v1/gecko-{level}-b-android
-    worker:
-        docker-image: {in-tree: android-build}
-        max-run-time: 7200
-        env:
-            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-        artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
-            - name: public/android/maven
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/officialWithGeckoBinariesNoMinApi/debug/geckoview_example-official-withGeckoBinaries-noMinApi-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets build multi-l10n update]
-        config:
-            - builds/releng_base_android_64_builds.py
-            - disable_signing.py
-            - taskcluster_nightly.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: api-16-old-id
-        tooltool-downloads: internal
-    run-on-projects: ['mozilla-central']
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-sccache
-
 android-aarch64/opt:
     description: "Android 5.0 AArch64 Opt"
     index:
         product: mobile
         job-name: android-aarch64-opt
     treeherder:
         platform: android-5-0-aarch64/opt
         symbol: B
--- a/taskcluster/ci/upload-symbols/kind.yml
+++ b/taskcluster/ci/upload-symbols/kind.yml
@@ -17,19 +17,17 @@ only-for-build-platforms:
     - linux64/debug
     - linux64-nightly/opt
     - linux-nightly/opt
     - linux64-devedition-nightly/opt
     - linux-devedition-nightly/opt
     - android-aarch64-nightly/opt
     - android-api-16/opt
     - android-api-16-nightly/opt
-    - android-api-16-old-id-nightly/opt
     - android-x86-nightly/opt
-    - android-x86-old-id-nightly/opt
     - macosx64-nightly/opt
     - macosx64-devedition-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
     - win32-devedition-nightly/opt
     - win64-devedition-nightly/opt
 
 job-template:
--- a/taskcluster/taskgraph/loader/push_apk.py
+++ b/taskcluster/taskgraph/loader/push_apk.py
@@ -30,20 +30,17 @@ def get_dependent_loaded_tasks(config, l
     nightly_tasks = (
         task for task in loaded_tasks if task.attributes.get('nightly')
     )
     tasks_with_matching_kind = (
         task for task in nightly_tasks if task.kind in config.get('kind-dependencies')
     )
     android_tasks = [
         task for task in tasks_with_matching_kind
-        # old-id builds are not shipped through the Play store, so we don't
-        # want them as dependencies.
-        if task.attributes.get('build_platform', '').startswith('android') \
-        and 'old-id' not in task.attributes.get('build_platform', '')
+        if task.attributes.get('build_platform', '').startswith('android')
     ]
 
     # TODO Bug 1368484: Activate aarch64 once ready
     non_aarch64_tasks = [
         task for task in android_tasks
         if 'aarch64' not in task.attributes.get('build_platform', '')
     ]
 
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -253,20 +253,19 @@ def target_tasks_valgrind(full_task_grap
 def target_tasks_nightly_fennec(full_task_graph, parameters, graph_config):
     """Select the set of tasks required for a nightly build of fennec. The
     nightly build process involves a pipeline of builds, signing,
     and, eventually, uploading the tasks to balrog."""
     def filter(task):
         platform = task.attributes.get('build_platform')
         if platform in ('android-aarch64-nightly',
                         'android-api-16-nightly',
-                        'android-api-16-old-id-nightly',
                         'android-nightly',
                         'android-x86-nightly',
-                        'android-x86-old-id-nightly'):
+                        ):
             if not task.attributes.get('nightly', False):
                 return False
             return filter_for_project(task, parameters)
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
 
 
 @_target_task('nightly_linux')
 def target_tasks_nightly_linux(full_task_graph, parameters, graph_config):
@@ -475,21 +474,16 @@ def target_tasks_promote_fennec(full_tas
     filtered_for_project = target_tasks_nightly_fennec(full_task_graph, parameters, graph_config)
 
     def filter(task):
         attr = task.attributes.get
         # Don't ship single locale fennec anymore - Bug 1408083
         if attr("locale") or attr("chunk_locales"):
             return False
         if task.label in filtered_for_project:
-            # bug 1438023 - old-id should only run on central.
-            # We can remove this hack when shippable builds land and we
-            # are using run-on-projects properly here.
-            if 'old-id' in task.label:
-                return False
             if task.kind not in ('balrog', 'push-apk'):
                 if task.attributes.get('nightly'):
                     return True
         if task.attributes.get('shipping_product') == 'fennec' and \
                 task.attributes.get('shipping_phase') == 'promote':
             return True
 
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(full_task_graph[l])]
--- a/taskcluster/taskgraph/transforms/beetmover.py
+++ b/taskcluster/taskgraph/transforms/beetmover.py
@@ -148,18 +148,16 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
     ],
     'linux64-devedition-source': [
     ],
     'linux64-fennec-source': [
     ],
     'android-x86-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
     'android-aarch64-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
     'android-api-16-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
-    'android-x86-old-id-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
-    'android-api-16-old-id-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
     'macosx64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
         "host/bin/mar",
         "host/bin/mbsdiff",
     ],
     'macosx64-devedition-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
         "host/bin/mar",
         "host/bin/mbsdiff",
     ],
@@ -179,21 +177,19 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
         "host/bin/mar.exe",
         "host/bin/mbsdiff.exe",
     ],
     'linux64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'linux64-devedition-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'linux-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'linux-devedition-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'android-x86-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
-    'android-x86-old-id-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
     'android-aarch64-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
     'android-api-16-nightly-l10n': [],
     'android-api-16-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
-    'android-api-16-old-id-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
     'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'macosx64-devedition-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'win32-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'win32-devedition-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'win64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'win64-devedition-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
 }
 # Until bug 1331141 is fixed, if you are adding any new artifacts here that
@@ -227,18 +223,16 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = {
     ],
     'linux64-fennec-source': [
         "source.tar.xz",
         "source.tar.xz.asc",
     ],
     'android-x86-nightly': ["en-US/target.apk"],
     'android-aarch64-nightly': ["en-US/target.apk"],
     'android-api-16-nightly': ["en-US/target.apk"],
-    'android-x86-old-id-nightly': ["en-US/target.apk"],
-    'android-api-16-old-id-nightly': ["en-US/target.apk"],
     'macosx64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US + [
         "target.dmg",
         "target.dmg.asc",
     ],
     'macosx64-devedition-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US + [
         "target.dmg",
         "target.dmg.asc",
     ],
@@ -266,21 +260,19 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = {
         "target.tar.bz2",
         "target.tar.bz2.asc",
     ],
     'linux-devedition-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N + [
         "target.tar.bz2",
         "target.tar.bz2.asc",
     ],
     'android-x86-nightly-multi': ["target.apk"],
-    'android-x86-old-id-nightly-multi': ["target.apk"],
     'android-aarch64-nightly-multi': ["target.apk"],
     'android-api-16-nightly-l10n': ["target.apk"],
     'android-api-16-nightly-multi': ["target.apk"],
-    'android-api-16-old-id-nightly-multi': ["target.apk"],
     'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N + [
         "target.dmg",
         "target.dmg.asc",
     ],
     'macosx64-devedition-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N + [
         "target.dmg",
         "target.dmg.asc",
     ],
--- a/taskcluster/taskgraph/transforms/release_deps.py
+++ b/taskcluster/taskgraph/transforms/release_deps.py
@@ -29,19 +29,16 @@ def add_dependencies(config, jobs):
             # XXX we have run-on-projects which specifies the on-push behavior;
             # we need another attribute that specifies release promotion,
             # possibly which action(s) each task belongs in.
             if product == 'fennec':
                 # Don't ship single locale fennec anymore - Bug 1408083
                 attr = dep_task.attributes.get
                 if attr("locale") or attr("chunk_locales"):
                     continue
-                # Skip old-id
-                if 'old-id' in dep_task.label:
-                    continue
             # We can only depend on tasks in the current or previous phases
             dep_phase = dep_task.attributes.get('shipping_phase')
             if dep_phase and PHASES.index(dep_phase) > PHASES.index(phase):
                 continue
 
             if dep_task.attributes.get("build_platform") and \
                job.get("attributes", {}).get("build_platform"):
                 if dep_task.attributes["build_platform"] != job["attributes"]["build_platform"]:
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -27,24 +27,16 @@
 #     },
 # }
 
 config = {
     ### release branches
     "mozilla-central": {
         "repo_path": 'mozilla-central',
         "update_channel": "nightly",
-        'platform_overrides': {
-            'android-api-16-old-id': {
-                "update_channel": "nightly-old-id",
-            },
-            'android-x86-old-id': {
-                "update_channel": "nightly-old-id",
-            },
-        }
     },
     'mozilla-release': {
         'enable_release_promotion': True,
         'repo_path': 'releases/mozilla-release',
         'update_channel': 'release',
         'branch_uses_per_checkin_strategy': True,
         'platform_overrides': {
             'linux': {
@@ -222,24 +214,16 @@ config = {
         'repo_path': 'integration/mozilla-inbound',
     },
     'autoland': {
         'repo_path': 'integration/autoland',
     },
     'ux': {},
     'date': {
         'update_channel': 'nightly-date',
-        'platform_overrides': {
-            'android-api-16-old-id': {
-                "update_channel": "nightly-old-id",
-            },
-            'android-x86-old-id': {
-                "update_channel": "nightly-old-id",
-            },
-        }
     },
     'cypress': {
         # bug 1164935
         'branch_uses_per_checkin_strategy': True,
     },
 
     ### other branches that do not require anything special:
     'alder': {},
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_old_id.py
+++ /dev/null
@@ -1,7 +0,0 @@
-config = {
-    'base_name': 'Android armv7 api-16+ %(branch)s OldId',
-    'stage_platform': 'android-api-16-old-id',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly-old-id',
-    'multi_locale_config_platform': 'android',
-    'artifact_flag_build_variant_in_try': 'api-16-artifact',
-}
deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_old_id.py
+++ /dev/null
@@ -1,6 +0,0 @@
-config = {
-    'base_name': 'Android 4.2 x86 %(branch)s build OldId',
-    'stage_platform': 'android-x86-old-id',
-    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly-old-id',
-    'artifact_flag_build_variant_in_try': 'x86-artifact',
-}
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -417,27 +417,25 @@ class BuildOptionParser(object):
         'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
         'asan-tc-and-debug': 'builds/releng_sub_%s_configs/%s_asan_tc_and_debug.py',
         'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
         'code-coverage': 'builds/releng_sub_%s_configs/%s_code_coverage.py',
         'source': 'builds/releng_sub_%s_configs/%s_source.py',
         'noopt-debug': 'builds/releng_sub_%s_configs/%s_noopt_debug.py',
         'api-16-gradle-dependencies': 'builds/releng_sub_%s_configs/%s_api_16_gradle_dependencies.py',
         'api-16': 'builds/releng_sub_%s_configs/%s_api_16.py',
-        'api-16-old-id': 'builds/releng_sub_%s_configs/%s_api_16_old_id.py',
         'api-16-artifact': 'builds/releng_sub_%s_configs/%s_api_16_artifact.py',
         'api-16-debug': 'builds/releng_sub_%s_configs/%s_api_16_debug.py',
         'api-16-debug-artifact': 'builds/releng_sub_%s_configs/%s_api_16_debug_artifact.py',
         'api-16-gradle': 'builds/releng_sub_%s_configs/%s_api_16_gradle.py',
         'api-16-gradle-artifact': 'builds/releng_sub_%s_configs/%s_api_16_gradle_artifact.py',
         'api-16-without-google-play-services': 'builds/releng_sub_%s_configs/%s_api_16_without_google_play_services.py',
         'rusttests': 'builds/releng_sub_%s_configs/%s_rusttests.py',
         'rusttests-debug': 'builds/releng_sub_%s_configs/%s_rusttests_debug.py',
         'x86': 'builds/releng_sub_%s_configs/%s_x86.py',
-        'x86-old-id': 'builds/releng_sub_%s_configs/%s_x86_old_id.py',
         'x86-artifact': 'builds/releng_sub_%s_configs/%s_x86_artifact.py',
         'api-16-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_16_partner_sample1.py',
         'aarch64': 'builds/releng_sub_%s_configs/%s_aarch64.py',
         'android-test': 'builds/releng_sub_%s_configs/%s_test.py',
         'android-checkstyle': 'builds/releng_sub_%s_configs/%s_checkstyle.py',
         'android-lint': 'builds/releng_sub_%s_configs/%s_lint.py',
         'android-findbugs': 'builds/releng_sub_%s_configs/%s_findbugs.py',
         'android-geckoview-docs': 'builds/releng_sub_%s_configs/%s_geckoview_docs.py',