diff --git a/taskcluster/ci/source-test/kind.yml b/taskcluster/ci/source-test/kind.yml index 5c3d909ca438..d199de4c688a 100644 --- a/taskcluster/ci/source-test/kind.yml +++ b/taskcluster/ci/source-test/kind.yml @@ -30,4 +30,4 @@ jobs-from: dependent-build-platforms: linux64-asan/opt: build-linux64-asan/opt linux64/debug: build-linux64/debug - linux64.*: build-linux64/opt + linux64.*: build-linux64/pgo diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml index 6d281b93ba15..3c7ca0a04d46 100644 --- a/taskcluster/ci/test/misc.yml +++ b/taskcluster/ci/test/misc.yml @@ -80,6 +80,7 @@ test-verify: # do not run on ccov .*-ccov/.*: [] .*-asan/.*: [] + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] # do not run on beta or release: usually just confirms earlier results default: ['trunk', 'try'] tier: 2 @@ -123,6 +124,7 @@ test-verify-gpu: # do not run on ccov .*-ccov/.*: [] .*-asan/.*: [] + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] # do not run on beta or release: usually just confirms earlier results default: ['trunk', 'try'] tier: 2 diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml index 1e26631a8331..d6bb09c58f77 100644 --- a/taskcluster/ci/test/mochitest.yml +++ b/taskcluster/ci/test/mochitest.yml @@ -138,9 +138,10 @@ browser-screenshots: run-on-projects: by-test-platform: # We don't want debug, pgo, devedition or nightly builds - windows7-32/opt: ['mozilla-central', 'integration'] - windows10-64/opt: ['mozilla-central', 'integration'] - linux64/opt: ['mozilla-central', 'integration'] + windows7-32-pgo(?:-qr)?/opt: ['mozilla-central', 'integration'] + windows10-64-pgo(?:-qr)?/opt: ['mozilla-central', 'integration'] + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central'] + linux64-pgo(?:-qr)?/opt: ['mozilla-central', 'integration'] macosx64/opt: ['mozilla-central', 'integration'] default: [] max-run-time: 3600 diff --git a/taskcluster/ci/test/raptor.yml b/taskcluster/ci/test/raptor.yml index ba2785c1f795..48d31f785e53 100644 --- a/taskcluster/ci/test/raptor.yml +++ b/taskcluster/ci/test/raptor.yml @@ -12,6 +12,7 @@ job-defaults: run-on-projects: by-test-platform: windows10-64-ux: ['try', 'mozilla-central'] + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] default: ['try', 'trunk', 'mozilla-beta'] tier: by-test-platform: diff --git a/taskcluster/ci/test/talos.yml b/taskcluster/ci/test/talos.yml index deb6c3dee369..910ab01ab546 100644 --- a/taskcluster/ci/test/talos.yml +++ b/taskcluster/ci/test/talos.yml @@ -32,6 +32,7 @@ talos-bcv: run-on-projects: by-test-platform: .*-qr/.*: [] # this test is not useful with webrender + (?:windows10-64|windows7-32|linux64)/opt: ['mozilla-central', 'try'] default: ['mozilla-beta', 'trunk', 'try'] tier: by-test-platform: @@ -46,7 +47,10 @@ talos-chrome: description: "Talos chrome" try-name: chromez treeherder-symbol: T(c) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: 1200 mozharness: extra-options: @@ -60,6 +64,7 @@ talos-damp: run-on-projects: by-test-platform: linux64-ccov/.*: ['try'] # Bug 1407593 + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] default: ['mozilla-beta', 'trunk', 'try'] mozharness: extra-options: @@ -69,7 +74,10 @@ talos-dromaeojs: description: "Talos dromaeojs" try-name: dromaeojs treeherder-symbol: T(d) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: 2100 mozharness: extra-options: @@ -80,7 +88,10 @@ talos-flex: try-name: flex treeherder-symbol: T(f) tier: 3 - run-on-projects: ['mozilla-central', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-central', 'try'] max-run-time: 1800 mozharness: extra-options: @@ -90,7 +101,10 @@ talos-g1: description: "Talos g1" try-name: g1 treeherder-symbol: T(g1) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: by-test-platform: linux64.*: 3600 @@ -103,7 +117,10 @@ talos-g3: description: "Talos g3" try-name: g3 treeherder-symbol: T(g3) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: 900 mozharness: extra-options: @@ -113,7 +130,10 @@ talos-g4: description: "Talos g4" try-name: g4 treeherder-symbol: T(g4) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: by-test-platform: linux64.*: 1500 @@ -126,7 +146,10 @@ talos-g5: description: "Talos g5" try-name: g5 treeherder-symbol: T(g5) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] mozharness: extra-options: - --suite=g5 @@ -139,7 +162,10 @@ talos-h1: description: "Talos h1" try-name: h1 treeherder-symbol: T(h1) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] mozharness: extra-options: - --suite=h1 @@ -152,7 +178,10 @@ talos-h2: description: "Talos h2" try-name: h2 treeherder-symbol: T(h2) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: by-test-platform: linux64.*: 900 @@ -165,7 +194,10 @@ talos-motionmark: description: "Talos motionmark" try-name: motionmark treeherder-symbol: T(mm) - run-on-projects: ['mozilla-central', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-central', 'try'] max-run-time: 3600 tier: by-test-platform: @@ -180,7 +212,10 @@ talos-other: description: "Talos other" try-name: other treeherder-symbol: T(o) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: 1500 mozharness: extra-options: @@ -190,7 +225,10 @@ talos-sessionrestore-many-windows: description: "Talos sessionrestore-many-windows" try-name: sessionrestore-many-windows treeherder-symbol: T(smw) - run-on-projects: ['mozilla-central', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-central', 'try'] max-run-time: 1500 mozharness: extra-options: @@ -200,7 +238,10 @@ talos-perf-reftest: description: "Talos perf-reftest" try-name: perf-reftest treeherder-symbol: T(p) - run-on-projects: ['trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['trunk', 'try'] max-run-time: 1200 mozharness: extra-options: @@ -210,7 +251,10 @@ talos-perf-reftest-singletons: description: "Talos perf-reftest singletons" try-name: perf-reftest-singletons treeherder-symbol: T(ps) - run-on-projects: ['trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['trunk', 'try'] max-run-time: 1200 mozharness: extra-options: @@ -220,7 +264,10 @@ talos-speedometer: description: "Talos speedometer" try-name: speedometer treeherder-symbol: T(sp) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: 1500 mozharness: extra-options: @@ -230,7 +277,10 @@ talos-svgr: description: "Talos svgr" try-name: svgr treeherder-symbol: T(s) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: 1800 mozharness: extra-options: @@ -240,7 +290,10 @@ talos-tp5o: description: "Talos tp5o" try-name: tp5o treeherder-symbol: T(tp) - run-on-projects: ['mozilla-beta', 'trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['mozilla-beta', 'trunk', 'try'] max-run-time: 1800 mozharness: extra-options: @@ -250,7 +303,10 @@ talos-tp6: description: "Talos tp6" try-name: tp6 treeherder-symbol: T(tp6) - run-on-projects: ['trunk', 'try'] + run-on-projects: + by-test-platform: + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] + default: ['trunk', 'try'] max-run-time: 1200 mozharness: extra-options: @@ -264,6 +320,7 @@ talos-tp6-stylo-threads: run-on-projects: by-test-platform: macosx.*: ['mozilla-beta', 'autoland', 'try'] + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] default: ['mozilla-beta', 'trunk', 'try'] mozharness: extra-options: @@ -277,6 +334,7 @@ talos-tps: run-on-projects: by-test-platform: linux64-ccov/.*: ['try'] # Bug 1407593 + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] default: ['mozilla-beta', 'trunk', 'try'] mozharness: extra-options: @@ -295,9 +353,10 @@ talos-xperf: windows10-64.*: true run-on-projects: by-test-platform: - windows7-32(-pgo)?/.*: ['mozilla-beta', 'trunk', 'try'] + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] windows10-aarch64/opt: [] - windows10-64.*/opt: ['mozilla-beta', 'trunk', 'try'] + windows7-32-pgo(?:-qr)?/.*: ['mozilla-beta', 'trunk', 'try'] + windows10-64-(?!qr).*/opt: ['mozilla-beta', 'trunk', 'try'] default: [] tier: by-test-platform: diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml index ef65f552a5ec..64fe4f481b56 100644 --- a/taskcluster/ci/test/test-platforms.yml +++ b/taskcluster/ci/test/test-platforms.yml @@ -106,6 +106,15 @@ linux64-qr/opt: - web-platform-tests - raptor-firefox - raptor-fetch-firefox +linux64-pgo-qr/opt: + build-platform: linux64-pgo/opt + test-sets: + - linux-qr-tests + - talos + - awsy + - web-platform-tests + - raptor-firefox + - raptor-fetch-firefox linux64-qr/debug: build-platform: linux64/debug test-sets: @@ -276,6 +285,15 @@ windows10-64-qr/opt: - raptor-firefox - web-platform-tests +windows10-64-pgo-qr/opt: + build-platform: win64-pgo/opt + test-sets: + - awsy + - windows-qr-tests + - windows-talos + - raptor-firefox + - web-platform-tests + ## # MacOS X platforms (matching /macosx.*/) diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml index 263abc4adbaa..3e4e6f867874 100644 --- a/taskcluster/ci/test/web-platform.yml +++ b/taskcluster/ci/test/web-platform.yml @@ -192,6 +192,7 @@ test-verify-wpt: # do not run on ccov .*-ccov/.*: [] .*-asan/.*: [] + (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try'] # do not run on beta or release: usually just confirms earlier results default: ['trunk', 'try'] tier: 2 diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index f314a7fb28f6..a5a2a552b95e 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -112,6 +112,11 @@ WINDOWS_WORKER_TYPES = { 'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu', 'hardware': 'releng-hardware/gecko-t-win10-64-hw', }, + 'windows10-64-pgo-qr': { + 'virtual': 'aws-provisioner-v1/gecko-t-win10-64', + 'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu', + 'hardware': 'releng-hardware/gecko-t-win10-64-hw', + }, 'windows10-64-ux': { 'virtual': 'aws-provisioner-v1/gecko-t-win10-64', 'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu', @@ -645,6 +650,7 @@ def set_tier(config, tests): 'linux64-asan/opt', 'linux64-qr/opt', 'linux64-qr/debug', + 'linux64-pgo-qr/opt', 'windows7-32/debug', 'windows7-32/opt', 'windows7-32-pgo/opt', @@ -659,6 +665,7 @@ def set_tier(config, tests): 'windows10-64-asan/opt', 'windows10-64-qr/opt', 'windows10-64-qr/debug', + 'windows10-64-pgo-qr/opt', 'macosx64/opt', 'macosx64/debug', 'macosx64-nightly/opt',