diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml index 4f72cdd0374a..f82b727511e5 100644 --- a/taskcluster/ci/config.yml +++ b/taskcluster/ci/config.yml @@ -17,32 +17,22 @@ treeherder: 'Bpgo': 'Profile-guided optimization builds' 'Btime': 'Browsertime performance tests on Firefox' 'Btime-1proc': 'Browsertime performance tests on Firefox without e10s' - 'Btime-wr-1proc': 'Browsertime performance tests on Firefox without e10s, with webrender enabled' 'Btime-fis': 'Browsertime performance tests on Firefox with fission enabled' 'Btime-Prof': 'Browsertime performance tests on Firefox with Gecko Profiling' - 'Btime-Prof-wr': 'Browsertime performance tests on Firefox with Gecko Profiling, webrender enabled' 'Btime-Prof-fis': 'Browsertime performance tests on Firefox with Gecko Profiling, fission enabled' 'Btime-Prof-1proc': 'Browsertime performance tests on Firefox with Gecko Profiling and without e10s' 'Btime-live': 'Browsertime performance tests on Firefox' 'Btime-live-fis': 'Browsertime performance tests on Firefox with fission enabled' 'Btime-live-fenix': 'Browsertime performance tests on Firefox' - 'Btime-live-fenix-wr': 'Browsertime performance tests on Firefox with webrender enabled' 'Btime-live-ChR': 'Browsertime performance tests on Firefox' 'Btime-live-Cr': 'Browsertime performance tests on Google Chromium' 'Btime-ChR': 'Browsertime performance tests on Google Chrome Release' 'Btime-Cr': 'Browsertime performance tests on Google Chromium' 'Btime-P': 'Browsertime power tests on Firefox/Geckoview' - 'Btime-P-wr': 'Browsertime power tests on Firefox/Geckoview with webrender enabled' 'Btime-P-fenix': 'Browsertime power tests on Fenix' - 'Btime-P-fenix-wr': 'Browsertime power tests on Fenix with webrender enabled' 'Btime-P-refbrow': 'Browsertime power tests on reference browser' - 'Btime-P-refbrow-wr': 'Browsertime power tests on reference browser with webrender enabled' 'Btime-fenix': 'Browsertime performance tests on Fenix' - 'Btime-fenix-wr': 'Browsertime performance tests on Fenix with webrender enabled' 'Btime-refbrow': 'Browsertime performance tests on the reference browser' - 'Btime-refbrow-wr': 'Browsertime performance tests on the reference browser with webrender enabled' - 'Btime-wr': 'Browsertime performance tests on Android with webrender enabled' - 'Btime-live-wr': 'Browsertime performance tests on Android with webrender enabled' 'Fetch': 'Fetch and store content' 'Fxfn-l': 'Firefox functional tests (local)' 'Fxfn-r': 'Firefox functional tests (remote)' diff --git a/taskcluster/ci/test/browsertime-mobile.yml b/taskcluster/ci/test/browsertime-mobile.yml index 9ca6d66dc21c..44d3b5aaaabf 100644 --- a/taskcluster/ci/test/browsertime-mobile.yml +++ b/taskcluster/ci/test/browsertime-mobile.yml @@ -10,10 +10,8 @@ job-defaults: refbrow: [] default: by-test-platform: - android-hw-p2-.*aarch64.*/pgo: ["mozilla-central"] - android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central"] + android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central] default: [] - webrender-run-on-projects: [] tier: 3 test-manifest-loader: null # don't load tests in the taskgraph target: @@ -60,103 +58,56 @@ job-defaults: - --no-conditioned-profile optimization: skip-unless-backstop: null - variants: - by-app: - chrome-m: [] - default: ["webrender"] python-3: true + limit-platforms: + by-app: + chrome-m: + - .*shippable(?!-qr).* + default: [] browsertime-tp6m: description: "Raptor (browsertime) tp6 page-load tests on android" raptor-test: tp6m raptor-subtests: - by-app: - chrome-m: - - amazon - - youtube - default: - - allrecipes - - amazon - - [amazon-search, amazon-s] - - bbc - - bing - - [bing-search-restaurants, bing-s-r] - - booking - - cnn - - [cnn-ampstories, cnn-amp] - - [ebay-kleinanzeigen, ebay-k] - - [ebay-kleinanzeigen-search, ebay-k-s] - - espn - - facebook - - [facebook-cristiano, fb-cris] - - google - - [google-maps, gmaps] - - [google-search-restaurants, gsearch-r] - - instagram - - imdb - - jianshu - - [microsoft-support, micros-sup] - - reddit - - [stackoverflow, stacko] - - web-de - - wikipedia - - youtube - - [youtube-watch, youtube-w] + - allrecipes + - amazon + - [amazon-search, amazon-s] + - bbc + - bing + - [bing-search-restaurants, bing-s-r] + - booking + - cnn + - [cnn-ampstories, cnn-amp] + - [ebay-kleinanzeigen, ebay-k] + - [ebay-kleinanzeigen-search, ebay-k-s] + - espn + - facebook + - [facebook-cristiano, fb-cris] + - google + - [google-maps, gmaps] + - [google-search-restaurants, gsearch-r] + - instagram + - imdb + - jianshu + - [microsoft-support, micros-sup] + - reddit + - [stackoverflow, stacko] + - web-de + - wikipedia + - youtube + - [youtube-watch, youtube-w] apps: ["geckoview", "fenix", "chrome-m", "refbrow"] tier: - by-raptor-test: - amazon: - by-app: - fenix: 1 - geckoview: 1 - refbrow: 2 - default: 3 - default: - by-app: - geckoview: 1 - refbrow: 2 - default: 3 - webrender-run-on-projects: - by-raptor-test: - amazon: - by-app: - fenix: [] - chrome-m: [] - geckoview: - &sheriffed-platforms - by-test-platform: - android-hw-g5-7-0-arm7-api-16-shippable/opt: ['trunk', 'mozilla-beta'] - android-hw-p2-8-0-android-aarch64-shippable/opt: ['trunk', 'mozilla-beta'] - default: [] - default: - by-test-platform: - android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central"] - default: [] - youtube: - by-app: - fenix: [] - chrome-m: [] - refbrow: [] - geckoview: *sheriffed-platforms - default: - by-test-platform: - android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central", "try"] - default: [] - default: - by-app: - geckoview: *sheriffed-platforms - default: [] + by-app: + geckoview: 1 + refbrow: 2 + default: 3 run-on-projects: by-app: geckoview: - by-subtest: - allrecipes: *sheriffed-platforms - amazon-search: *sheriffed-platforms - espn: *sheriffed-platforms - facebook: *sheriffed-platforms - google: *sheriffed-platforms - microsoft-support: *sheriffed-platforms - youtube-watch: *sheriffed-platforms + by-test-platform: + android-hw-g5.*shippable.*: [trunk, mozilla-beta] + android-hw-p2.*aarch64-shippable.*: [trunk, mozilla-beta] default: [] default: [] run-visual-metrics: true @@ -185,12 +136,12 @@ browsertime-youtube-playback-mobile: # - [youtube-playback-widevine-hfr, ytp-widevine-hfr] # - [youtube-playback-widevine-vp9-sfr, ytp-widevine-vp9-sfr] apps: ["fenix", "geckoview", "refbrow"] - webrender-run-on-projects: + run-on-projects: by-app: geckoview: by-test-platform: - android-hw-g5-7-0-arm7-api-16-shippable/opt: ["mozilla-central"] - android-hw-p2-8-0-android-aarch64-shippable/opt: ["mozilla-central"] + android-hw-g5.*shippable.*: [mozilla-central] + android-hw-p2.*aarch64-shippable.*: [mozilla-central] default: [] default: [] test-url-param: @@ -266,13 +217,12 @@ browsertime-tp6m-live: - youtube - [youtube-watch, youtube-w] apps: ["fenix", "chrome-m", "geckoview"] - run-on-projects: [] - webrender-run-on-projects: + run-on-projects: by-app: geckoview: by-test-platform: - android-hw-g5-7-0-arm7-api-16-shippable/opt: ["autoland"] - android-hw-p2-8-0-android-aarch64-shippable/opt: ["autoland"] + android-hw-g5.*shippable-qr.*: [autoland] + android-hw-p2.*aarch64-shippable-qr.*: [autoland] default: [] default: [] run-visual-metrics: true @@ -303,14 +253,19 @@ browsertime-speedometer-mobile: by-app: fenix: 1 default: 3 - webrender-run-on-projects: + run-on-projects: by-app: + refbrow: [] geckoview: by-test-platform: - android-hw-g5-7-0-arm7-api-16-shippable/opt: ['trunk', 'mozilla-beta'] - android-hw-p2-8-0-android-aarch64-shippable/opt: ['trunk', 'mozilla-beta'] + android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central] + android-hw-g5.*shippable-qr.*: [trunk, mozilla-beta] + android-hw-p2.*aarch64-shippable-qr.*: [trunk, mozilla-beta] + default: [] + default: + by-test-platform: + android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central] default: [] - default: [] treeherder-symbol: Btime(sp) mozharness: extra-options: @@ -321,14 +276,19 @@ browsertime-unity-webgl-mobile: description: "Browsertime Unity WebGL on Android" apps: ["geckoview", "refbrow", "fenix", "chrome-m"] treeherder-symbol: Btime(ugl) - webrender-run-on-projects: + run-on-projects: by-app: + refbrow: [] geckoview: by-test-platform: - android-hw-g5-7-0-arm7-api-16-shippable/opt: ['trunk', 'mozilla-beta'] - android-hw-p2-8-0-android-aarch64-shippable/opt: ['trunk', 'mozilla-beta'] + android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central] + android-hw-g5.*shippable-qr.*: [trunk, mozilla-beta] + android-hw-p2.*aarch64-shippable-qr.*: [trunk, mozilla-beta] + default: [] + default: + by-test-platform: + android-hw-p2-.*aarch64-shippable(?!-qr).*: [mozilla-central] default: [] - default: [] max-run-time: 900 mozharness: extra-options: @@ -345,7 +305,6 @@ browsertime-power: - idle - idle-bg - [speedometer, sp] - variants: ["webrender"] run-on-projects: [] treeherder-symbol: Btime-P(power) mozharness: diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml index 5ce210a7201a..0f31e9f3d8c8 100644 --- a/taskcluster/ci/test/test-platforms.yml +++ b/taskcluster/ci/test/test-platforms.yml @@ -458,23 +458,33 @@ android-em-7.0-x86_64-qr/debug: android-hw-g5-7-0-arm7-api-16/opt: build-platform: android-api-16/opt test-sets: - - android-hw-arm7-browsertime + - android-hw-browsertime - android-hw-arm7-raptor-cpu-memory - android-hw-arm7-raptor-cpu-memory-power android-hw-g5-7-0-arm7-api-16-shippable/opt: build-platform: android-api-16-shippable/opt test-sets: - - android-hw-arm7-browsertime + - android-hw-browsertime - android-hw-arm7-raptor-cpu-memory - android-hw-arm7-raptor-cpu-memory-power +android-hw-g5-7-0-arm7-api-16-qr/opt: + build-platform: android-api-16/opt + test-sets: + - android-hw-browsertime + +android-hw-g5-7-0-arm7-api-16-shippable-qr/opt: + build-platform: android-api-16-shippable/opt + test-sets: + - android-hw-browsertime + # android-hw-p2-8-0 Google Pixel 2 Android 8.0 android-hw-p2-8-0-arm7-api-16/opt: build-platform: android-api-16/opt test-sets: - - android-hw-arm7-browsertime + - android-hw-browsertime - android-hw-arm7-pgo-unittests - android-hw-arm7-raptor-cpu-memory - android-hw-arm7-raptor-cpu-memory-power @@ -482,7 +492,7 @@ android-hw-p2-8-0-arm7-api-16/opt: android-hw-p2-8-0-arm7-api-16-shippable/opt: build-platform: android-api-16-shippable/opt test-sets: - - android-hw-arm7-browsertime + - android-hw-browsertime - android-hw-arm7-pgo-unittests - android-hw-arm7-raptor-cpu-memory - android-hw-arm7-raptor-cpu-memory-power @@ -496,11 +506,13 @@ android-hw-p2-8-0-android-aarch64-qr/opt: build-platform: android-aarch64/opt test-sets: - android-hw-aarch64-qr + - android-hw-browsertime android-hw-p2-8-0-android-aarch64-shippable-qr/opt: build-platform: android-aarch64-shippable/opt test-sets: - android-hw-aarch64-qr + - android-hw-browsertime android-hw-p2-8-0-android-aarch64-qr/debug: build-platform: android-aarch64/debug @@ -510,7 +522,7 @@ android-hw-p2-8-0-android-aarch64-qr/debug: android-hw-p2-8-0-android-aarch64/opt: build-platform: android-aarch64/opt test-sets: - - android-hw-aarch64-browsertime + - android-hw-browsertime - android-hw-aarch64-opt-unittests - android-hw-aarch64-raptor-cpu-memory - android-hw-aarch64-raptor-cpu-memory-power @@ -518,7 +530,7 @@ android-hw-p2-8-0-android-aarch64/opt: android-hw-p2-8-0-android-aarch64-shippable/opt: build-platform: android-aarch64-shippable/opt test-sets: - - android-hw-aarch64-browsertime + - android-hw-browsertime - android-hw-aarch64-pgo-unittests - android-hw-aarch64-raptor-cpu-memory - android-hw-aarch64-raptor-cpu-memory-power diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml index 8f38f4bfe16e..4fbcbe780ed8 100644 --- a/taskcluster/ci/test/test-sets.yml +++ b/taskcluster/ci/test/test-sets.yml @@ -543,16 +543,7 @@ android-hw-aarch64-raptor-cpu-memory-power: - raptor-scn-cpu-memory-power-idle-bg-geckoview - raptor-scn-cpu-memory-power-idle-bg-refbrow -android-hw-aarch64-browsertime: - - browsertime-power - - browsertime-tp6m - - browsertime-tp6m-live - - browsertime-tp6m-profiling - - browsertime-speedometer-mobile - - browsertime-youtube-playback-mobile - - browsertime-unity-webgl-mobile - -android-hw-arm7-browsertime: +android-hw-browsertime: - browsertime-power - browsertime-tp6m - browsertime-tp6m-live