# HG changeset patch # User Chris AtLee # Date 1522358373 14400 # Thu Mar 29 17:19:33 2018 -0400 # Node ID 8f3d33f7c72babbf232f1938e982d4dd5f54f142 # Parent df8939b30043b1b362637f7d26565a733321576e Bug 1442330: Remove android old-id builds r=jlorenzo MozReview-Commit-ID: 9o3iXM5oHQM diff --git a/python/mozrelease/mozrelease/platforms.py b/python/mozrelease/mozrelease/platforms.py --- 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. diff --git a/testing/mozharness/configs/builds/branch_specifics.py b/testing/mozharness/configs/builds/branch_specifics.py --- 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': { @@ -228,24 +220,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': {}, diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_old_id.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_old_id.py deleted file mode 100644 --- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_old_id.py +++ /dev/null @@ -1,8 +0,0 @@ -config = { - 'base_name': 'Android armv7 api-16+ %(branch)s OldId', - 'stage_platform': 'android-api-16-old-id', - 'build_type': 'api-16-opt', - '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', -} diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_old_id.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_old_id.py deleted file mode 100644 --- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_old_id.py +++ /dev/null @@ -1,8 +0,0 @@ -config = { - 'base_name': 'Android 4.2 x86 %(branch)s build OldId', - 'stage_platform': 'android-x86-old-id', - 'publish_nightly_en_US_routes': False, - 'build_type': 'x86-opt', - 'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly-old-id', - 'artifact_flag_build_variant_in_try': 'x86-artifact', -} diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -421,24 +421,22 @@ class BuildOptionParser(object): 'lto-tc': 'builds/releng_sub_%s_configs/%s_lto_tc.py', 'lto-tc-and-debug': 'builds/releng_sub_%s_configs/%s_lto_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', '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', 'valgrind' : 'builds/releng_sub_%s_configs/%s_valgrind.py',