From be67d46e145c32634d3c6db83c7785920bd1cbd0 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Wed, 4 Sep 2019 15:58:36 +0000 Subject: [PATCH] Bug 1577037 - Stop running all Fennec functional tests; r=bc Stop running all Fennec functional (non-performance) tests: - stop running all Android 4.3 tests - switch android-em-7 cppunit and android-hw jittest from the Fennec apk to the geckoview apk (no difference in behavior expected) - stop running Android 7.0 marionette tests, since they also run against Fennec - remove android-em-4.* references from taskcluster configs - remove android instance: extra-large references from taskcluster configs, since they only affect aws, which is no longer used for Android Android-hw raptor tests running against Fennec remain; I will prepare a separate patch for those. Differential Revision: https://phabricator.services.mozilla.com/D43684 --HG-- extra : moz-landing-system : lando --- taskcluster/ci/test/compiled.yml | 22 +++---- taskcluster/ci/test/marionette.yml | 8 +-- taskcluster/ci/test/misc.yml | 60 ------------------- taskcluster/ci/test/mochitest.yml | 32 +--------- taskcluster/ci/test/reftest.yml | 19 ------ taskcluster/ci/test/test-platforms.yml | 24 -------- taskcluster/ci/test/test-sets.yml | 19 ------ taskcluster/ci/test/xpcshell.yml | 12 ---- taskcluster/taskgraph/transforms/tests.py | 11 ---- taskcluster/taskgraph/try_option_syntax.py | 2 - .../configs/android/androidarm_4_3_junit.py | 32 ---------- tools/tryselect/selectors/coverage.py | 1 - 12 files changed, 9 insertions(+), 233 deletions(-) delete mode 100644 testing/mozharness/configs/android/androidarm_4_3_junit.py diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml index f19a6113f314..653ba680ecbe 100644 --- a/taskcluster/ci/test/compiled.yml +++ b/taskcluster/ci/test/compiled.yml @@ -12,9 +12,6 @@ job-defaults: default: desktop_unittest.py config: by-test-platform: - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3.py android-em-7.*: - android/android_common.py - android/androidx86_7_0.py @@ -33,18 +30,14 @@ cppunit: description: "CPP Unit Tests" suite: cppunittest treeherder-symbol: cppunit - instance-size: + target: by-test-platform: - android-em.*: xlarge - default: default + android-em-7.*: geckoview-androidTest.apk + default: null tier: by-test-platform: windows10-aarch64.*: 2 default: default - run-on-projects: - by-test-platform: - android-em-4.3-arm7-api-16/opt: [] # bug 1548659 - default: built-projects gtest: description: "GTests run" @@ -80,10 +73,6 @@ jittest: category: jittest name: jittest-chunked treeherder-symbol: Jit - instance-size: - by-test-platform: - android-em.*: xlarge - default: default run-on-projects: by-test-platform: # Turn off for all linux and windows platforms, since it is @@ -111,7 +100,6 @@ jittest: windows10-64-ccov/debug: 6 macosx.*/opt: 1 macosx.*/debug: 3 - android-em-4.3-arm7-api-15/debug: 20 android.*: 10 default: 6 max-run-time: @@ -125,6 +113,10 @@ jittest: windows.*: false macosx.*: false default: true + target: + by-test-platform: + android-.*: geckoview-androidTest.apk + default: null tier: by-test-platform: android-hw.*: 2 diff --git a/taskcluster/ci/test/marionette.yml b/taskcluster/ci/test/marionette.yml index 6ecef1f044d5..f972ebec4b45 100644 --- a/taskcluster/ci/test/marionette.yml +++ b/taskcluster/ci/test/marionette.yml @@ -5,15 +5,9 @@ job-defaults: suite: marionette mozharness: - script: - by-test-platform: - android-em.*: android_emulator_unittest.py - default: marionette.py + script: marionette.py config: by-test-platform: - android-em.*: - - android/android_common.py - - android/androidx86_7_0-old.py macosx.*: - marionette/prod_config.py - marionette/mac_taskcluster_config.py diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml index bb954cb9ebc8..f63f28b16cfd 100644 --- a/taskcluster/ci/test/misc.yml +++ b/taskcluster/ci/test/misc.yml @@ -6,22 +6,11 @@ geckoview-junit: description: "Geckoview junit run" suite: geckoview-junit treeherder-symbol: gv-junit - instance-size: xlarge loopback-video: true e10s: true target: geckoview-androidTest.apk max-run-time: 3600 tier: default - chunks: - by-test-platform: - android-em-4.3-arm7-api-16-ccov/debug: 12 - android-em-4.3-arm7-api-16.*\/debug: 12 - android-em-4.*\/(?:opt|pgo)?: 7 - default: 1 - run-on-projects: - by-test-platform: - android-em-4.3-arm7-api-16/opt: ['try'] - default: ['try', 'trunk', 'mozilla-beta', 'mozilla-release'] mozharness: script: android_emulator_unittest.py config: @@ -29,37 +18,9 @@ geckoview-junit: android-em-7.*: - android/android_common.py - android/androidx86_7_0.py - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3_junit.py extra-options: - --test-suite=geckoview-junit -robocop: - description: "Robocop run" - suite: robocop - treeherder-symbol: M(rc) - instance-size: xlarge - tier: 2 - chunks: - by-test-platform: - # android-em-4.3-arm7-api-16/debug -- not run - android-em-4.3-arm7-api-16-ccov/debug: 8 - android-em-4.*\/(?:opt|pgo)?: 4 - loopback-video: true - e10s: false - run-on-projects: - by-test-platform: - android-em-4.*/.*: ['try', 'mozilla-central'] - default: built-projects - mozharness: - script: android_emulator_unittest.py - config: - - android/android_common.py - - android/androidarm_4_3.py - extra-options: - - --test-suite=robocop - telemetry-tests-client: description: "Telemetry tests client run" suite: telemetry-tests-client @@ -80,15 +41,10 @@ test-verify: suite: test-verify treeherder-symbol: TV loopback-video: true - instance-size: - by-test-platform: - android-em.*: xlarge - default: default max-run-time: 10800 allow-software-gl-layers: false run-on-projects: by-test-platform: - android-em-4.*/.*: ['try', 'mozilla-central'] # bug 1548659 # do not run on ccov .*-ccov/.*: [] .*-asan/.*: [] @@ -111,9 +67,6 @@ test-verify: android-em-7.*: - android/android_common.py - android/androidx86_7_0.py - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3.py linux.*: - unittests/linux_unittest.py - remove_executables.py @@ -133,10 +86,6 @@ test-verify-gpu: treeherder-symbol: TVg loopback-video: true virtualization: virtual-with-gpu - instance-size: - by-test-platform: - android-em.*: xlarge - default: default max-run-time: 10800 allow-software-gl-layers: false run-on-projects: @@ -159,9 +108,6 @@ test-verify-gpu: android-em-7.*: - android/android_common.py - android/androidx86_7_0.py - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3.py linux.*: - unittests/linux_unittest.py - remove_executables.py @@ -196,9 +142,6 @@ test-coverage: android-em-7.*: - android/android_common.py - android/androidx86_7_0.py - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3.py linux.*: - unittests/linux_unittest.py - remove_executables.py @@ -237,9 +180,6 @@ test-coverage-gpu: android-em-7.*: - android/android_common.py - android/androidx86_7_0.py - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3.py linux.*: - unittests/linux_unittest.py - remove_executables.py diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml index 442e7572e9d2..0dd40895d2d2 100644 --- a/taskcluster/ci/test/mochitest.yml +++ b/taskcluster/ci/test/mochitest.yml @@ -16,7 +16,6 @@ job-defaults: default: ['fission'] run-on-projects: by-test-platform: - android-em-4.*/.*: ['try', 'mozilla-central'] # bug 1548659 windows10-aarch64/opt: ['try', 'mozilla-central'] default: built-projects mozharness: @@ -30,9 +29,6 @@ job-defaults: android-em-7.*: - android/android_common.py - android/androidx86_7_0.py - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3.py android-hw.*: - android/android_common.py - android/android_hw.py @@ -54,14 +50,8 @@ mochitest: by-test-platform: windows10-aarch64.*: 2 default: default - instance-size: - by-test-platform: - android-em.*: xlarge - default: default chunks: by-test-platform: - android-em-4.*\/debug: 60 - android-em-4.*\/(?:opt|pgo)?: 24 android-em-7.*: 3 linux.*/debug: 16 linux64-asan/opt: 10 @@ -177,16 +167,9 @@ mochitest-chrome: tier: by-test-platform: windows10-aarch64.*: 2 - android-em-4.*/.*: 2 # bug 1548659 - default: default - instance-size: - by-test-platform: - android-em.*: xlarge default: default chunks: by-test-platform: - android-em-4.*\/debug: 8 - android-em.4.*\/(?:opt|pgo)?: 4 android-em-7.*: 1 .*-ccov/.*: 3 .*-qr/.*: 3 @@ -270,18 +253,9 @@ mochitest-gpu: tier: by-test-platform: windows10-aarch64.*: 2 - android-em-4.*/.*: 2 # bug 1548659 - default: default - instance-size: - by-test-platform: - android-em.*: xlarge default: default virtualization: virtual-with-gpu e10s: true - run-on-projects: - by-test-platform: - android-em-4.*/.*: ['try', 'mozilla-central'] - default: built-projects mozharness: mochitest-flavor: plain extra-options: @@ -304,7 +278,6 @@ mochitest-media: by-test-platform: android-hw-.*-api-16/opt: ['try'] android-hw-.*-api-16/(?:debug|pgo)?: ['try', 'trunk', 'mozilla-beta', 'mozilla-release'] - android-em-4.*/.*: ['try'] # bug 1553955 windows10-aarch64/opt: ['try', 'mozilla-central'] default: built-projects variants: @@ -313,10 +286,7 @@ mochitest-media: linux64/debug: ['fission', 'serviceworker', 'socketprocess'] default: ['fission', 'socketprocess'] loopback-video: true - instance-size: - by-test-platform: - android-em.*: xlarge - default: large + instance-size: large chunks: by-test-platform: android-em-7.*: 1 diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml index bbbd4e607f07..f97107722332 100644 --- a/taskcluster/ci/test/reftest.yml +++ b/taskcluster/ci/test/reftest.yml @@ -16,7 +16,6 @@ job-defaults: default: ['fission'] run-on-projects: by-test-platform: - android-em-4.*/.*: ['try', 'mozilla-central'] # bug 1548659 android-hw-.*-qr/debug: ['try', 'mozilla-central'] android-hw-.*-qr/opt: ['try', 'mozilla-central', 'mozilla-inbound', 'autoland'] windows10-aarch64/opt: ['try', 'mozilla-central'] @@ -32,9 +31,6 @@ job-defaults: android-em-7.*: - android/android_common.py - android/androidx86_7_0.py - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3.py android-hw.*: - android/android_common.py - android/android_hw.py @@ -49,14 +45,8 @@ job-defaults: crashtest: description: "Crashtest run" treeherder-symbol: R(C) - instance-size: - by-test-platform: - android-em.*: xlarge - default: default chunks: by-test-platform: - android-em-4.*\/debug: 10 - android-em-4.*\/(?:opt|pgo)?: 4 android-em-7.*: 1 default: 1 e10s: true @@ -67,7 +57,6 @@ crashtest: tier: by-test-platform: windows10-aarch64.*: 2 - android-em-4.*/.*: 2 # bug 1548659 android-hw-.*-qr/.*: 2 default: default @@ -100,11 +89,9 @@ jsreftest: tier: by-test-platform: windows10-aarch64.*: 2 - android-em-4.*/.*: 2 # bug 1548659 default: default run-on-projects: by-test-platform: - android-em-4.*/.*: ['try', 'mozilla-central'] # bug 1548659 windows10-aarch64/opt: ['try', 'mozilla-central'] android-hw-.*-api-16/debug: ['try', 'mozilla-central'] default: built-projects @@ -112,15 +99,9 @@ jsreftest: reftest: description: "Reftest run" treeherder-symbol: R(R) - instance-size: - by-test-platform: - android-em.*: xlarge - default: default virtualization: virtual-with-gpu chunks: by-test-platform: - android-em-4.*\/debug: 56 - android-em.4.*\/(?:opt|pgo)?: 28 android-em-7.*: 2 linux64(-shippable|-devedition|-qr)?/opt: 5 macosx101.*-64-shippable(-qr)?/opt: 3 diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml index d7d1501f2b21..4e63e775dacb 100644 --- a/taskcluster/ci/test/test-platforms.yml +++ b/taskcluster/ci/test/test-platforms.yml @@ -333,30 +333,6 @@ macosx1014-64-ccov/debug: # # android-em test platforms execute on android emulators. -android-em-4.3-arm7-api-16/debug: - build-platform: android-api-16/debug - test-sets: - - android-common-tests - -# Disable ccov testing on Android due to issues with -# Java 8 features. Bug 1498721. -# android-em-4.3-arm7-api-16-ccov/debug: -# build-platform: android-api-16-ccov/debug -# test-sets: -# - android-ccov-tests - -android-em-4.3-arm7-api-16/opt: - build-platform: android-api-16/opt - test-sets: - - android-common-tests - - android-opt-tests - -android-em-4.3-arm7-api-16/pgo: - build-platform: android-api-16-pgo/opt - test-sets: - - android-common-tests - - android-opt-tests - android-em-7.0-x86_64/opt: build-platform: android-x86_64/opt test-sets: diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml index ced848ef740a..23eaf447bbe5 100644 --- a/taskcluster/ci/test/test-sets.yml +++ b/taskcluster/ci/test/test-sets.yml @@ -397,26 +397,11 @@ desktop-screenshot-capture: desktop-instrumentation: - browser-instrumentation -android-common-tests: - - crashtest - - mochitest - - mochitest-chrome - - mochitest-gpu - - mochitest-media - - reftest - - test-verify - - xpcshell - -android-opt-tests: - # Robocop tests often fail on Debug builds - - robocop - android-x86_64-tests: - cppunit - crashtest - geckoview-junit - gtest - - marionette - mochitest - mochitest-gpu - reftest @@ -425,10 +410,6 @@ android-x86_64-tests: - web-platform-tests-reftests - xpcshell -android-ccov-tests: - - geckoview-junit - - robocop - devtools-tests: - mochitest-devtools-chrome diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml index 5ee1bcf9b393..86ea40e9ee13 100644 --- a/taskcluster/ci/test/xpcshell.yml +++ b/taskcluster/ci/test/xpcshell.yml @@ -19,9 +19,6 @@ job-defaults: default: desktop_unittest.py config: by-test-platform: - android-em-4.*: - - android/android_common.py - - android/androidarm_4_3.py android-em-7.*: - android/android_common.py - android/androidx86_7_0-old.py @@ -49,26 +46,18 @@ xpcshell: by-test-platform: windows10-64-asan/opt: [] # No XPCShell on ASAN yet windows10-aarch64/opt: ['try', 'mozilla-central'] - android-em-4.*/.*: ['try', 'mozilla-central'] # bug 1548659 default: built-projects chunks: by-test-platform: .*-ccov/debug: 6 - android-em-4.*: 8 - android-em-4.3-arm7-api-16/debug: 12 android-em-7.*: 3 macosx.*(?!-ccov)...../.*: 2 linux64(-qr)?/debug: 6 windows(7-32|10-64)(-shippable|-devedition|-asan|.*-qr)?/.*: 2 windows10-aarch64/opt: 3 default: 5 - instance-size: - by-test-platform: - android-em.*: xlarge - default: default max-run-time: by-test-platform: - android-em-4.*: 7200 macosx.*(?!-ccov)...../.*: 3600 windows10-aarch64/.*: 3600 .*-ccov/debug: 5400 @@ -77,6 +66,5 @@ xpcshell: tier: by-test-platform: windows10-64-asan.*: 3 - android-em-4.*: 2 windows10-aarch64.*: 2 default: default diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index 04c73067a39c..87d902484db1 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -765,13 +765,6 @@ def set_treeherder_machine_platform(config, tests): 'win64-aarch64/opt': 'windows10-aarch64/opt', 'win32-pgo/opt': 'windows7-32/pgo', 'win64-pgo/opt': 'windows10-64/pgo', - # The build names for Android platforms have partially evolved over the - # years and need to be translated. - 'android-api-16/debug': 'android-em-4-3-armv7-api16/debug', - 'android-api-16-ccov/debug': 'android-em-4-3-armv7-api16-ccov/debug', - 'android-api-16/opt': 'android-em-4-3-armv7-api16/opt', - 'android-api-16-pgo/opt': 'android-em-4-3-armv7-api16/pgo', - 'android-x86/opt': 'android-em-4-2-x86/opt', } for test in tests: # For most desktop platforms, the above table is not used for "regular" @@ -852,10 +845,6 @@ def set_tier(config, tests): 'macosx1014-64-qr/opt', 'macosx1014-64-shippable-qr/opt', 'macosx1014-64-qr/debug', - 'android-em-4.3-arm7-api-16/opt', - 'android-em-4.3-arm7-api-16/debug', - 'android-em-4.3-arm7-api-16/pgo', - 'android-em-4.2-x86/opt', 'android-em-7.0-x86_64/opt', 'android-em-7.0-x86_64/debug', 'android-em-7.0-x86/opt']: diff --git a/taskcluster/taskgraph/try_option_syntax.py b/taskcluster/taskgraph/try_option_syntax.py index ec2540f85e64..14949adeeb3d 100644 --- a/taskcluster/taskgraph/try_option_syntax.py +++ b/taskcluster/taskgraph/try_option_syntax.py @@ -128,8 +128,6 @@ UNITTEST_PLATFORM_PRETTY_NAMES = { 'linux64-asan', 'linux64-stylo-sequential' ], - 'Android 4.3 Emulator': ['android-em-4.3-arm7-api-16'], - 'Android 4.3 Emulator PGO': ['android-em-4-3-armv7-api16-pgo'], 'Android 7.0 Moto G5 32bit': ['android-hw-g5-7.0-arm7-api-16'], 'Android 8.0 Google Pixel 2 32bit': ['android-hw-p2-8.0-arm7-api-16'], 'Android 8.0 Google Pixel 2 64bit': ['android-hw-p2-8.0-android-aarch64'], diff --git a/testing/mozharness/configs/android/androidarm_4_3_junit.py b/testing/mozharness/configs/android/androidarm_4_3_junit.py deleted file mode 100644 index da2b1c95fbfe..000000000000 --- a/testing/mozharness/configs/android/androidarm_4_3_junit.py +++ /dev/null @@ -1,32 +0,0 @@ -# mozharness configuration for Android 4.3 geckoview-junit tests -# -# This configuration should be combined with suite definitions and other -# mozharness configuration from android_common.py, or similar. - -config = { - "deprecated_sdk_path": True, - "tooltool_manifest_path": "testing/config/tooltool-manifests/androidarm_4_3/releng.manifest", - "emulator_manifest": """ - [ - { - "algorithm": "sha512", - "visibility": "internal", - "filename": "android-sdk_r24.0.2a-linux.tar.gz", - "unpack": true, - "digest": "9b7d4a6fcb33d80884c68e9099a3e11963a79ec0a380a5a9e1a093e630f960d0a5083392c8804121c3ad27ee8ba29ca8df785d19d5a7fdc89458c4e51ada5120", - "size": 38591399 - } - ]""", - "emulator_avd_name": "test-1", - "emulator_process_name": "emulator64-arm", - "emulator_extra_args": "-show-kernel -debug init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket -audio oss", - "exes": { - 'adb': '%(abs_work_dir)s/android-sdk-linux/platform-tools/adb', - }, - "env": { - "DISPLAY": ":0.0", - "PATH": "%(PATH)s:%(abs_work_dir)s/android-sdk-linux/tools:%(abs_work_dir)s/android-sdk-linux/platform-tools", - "MINIDUMP_SAVEPATH": "%(abs_work_dir)s/../minidumps" - }, - "bogomips_minimum": 250, -} diff --git a/tools/tryselect/selectors/coverage.py b/tools/tryselect/selectors/coverage.py index 2949bf298b33..132fa6905892 100644 --- a/tools/tryselect/selectors/coverage.py +++ b/tools/tryselect/selectors/coverage.py @@ -48,7 +48,6 @@ OPT_TASK_PATTERNS = [ 'macosx64/opt', 'windows10-64/opt', 'windows7-32/opt', - 'android-em-4.3-arm7-api-16/opt', 'linux64/opt', ]