Bug 1675086 - drop references to 'pgo' platforms for Linux and Windows. r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D95802
This commit is contained in:
Sebastian Hengst 2020-11-03 22:45:54 +00:00
Родитель 0e61089dc5
Коммит 78c64a3664
8 изменённых файлов: 6 добавлений и 34 удалений

Просмотреть файл

@ -85,17 +85,14 @@ job-template:
platform:
by-build-platform:
linux64: linux64/opt
linux64-pgo: linux64-pgo/opt
linux64-shippable: linux64-shippable/opt
linux: linux32/opt
linux-shippable: linux32-shippable/opt
macosx64: osx-cross/opt
macosx64-shippable: osx-shippable/opt
win32: windows2012-32/opt
win32-pgo: windows2012-32-pgo/opt
win32-shippable: windows2012-32-shippable/opt
win64: windows2012-64/opt
win64-pgo: windows2012-64-pgo/opt
win64-shippable: windows2012-64-shippable/opt
env:
by-build-platform:

Просмотреть файл

@ -15,10 +15,8 @@ kind-dependencies:
only-for-build-platforms:
- win32-devedition/opt
- win32-pgo/opt
- win32-shippable/opt
- win64-devedition/opt
- win64-pgo/opt
- win64-shippable/opt
- win64-aarch64-shippable/opt
- win64-aarch64-devedition/opt

Просмотреть файл

@ -23,20 +23,17 @@ only-for-build-platforms:
- linux64-devedition/opt
- linux64-asan-reporter-shippable/opt
- linux64/opt
- linux64-pgo/opt
- macosx64-shippable/opt
- macosx64-devedition/opt
- macosx64/opt
- win32-shippable/opt
- win32-devedition/opt
- win32/opt
- win32-pgo/opt
- win64-shippable/opt
- win64-devedition/opt
- win64-aarch64-shippable/opt
- win64-aarch64-devedition/opt
- win64/opt
- win64-pgo/opt
- win64-asan-reporter-shippable/opt
job-template:

Просмотреть файл

@ -8,7 +8,7 @@ job-defaults:
instance-size: xlarge
virtualization:
by-test-platform:
windows10-64(?:-pgo|-shippable)?-qr/.*: virtual-with-gpu
windows10-64(?:-shippable)?-qr/.*: virtual-with-gpu
windows10-64/.*: virtual-with-gpu
default: virtual
allow-software-gl-layers: false

Просмотреть файл

@ -50,7 +50,6 @@ gtest:
run-on-projects:
by-test-platform:
windows.*-shippable/.*: [] # permafails on shippable
windows.*-pgo/.*: [] # permafails on pgo too
windows.*-nightly/.*: [] # permafails on nightly too
.*-devedition/.*: [] # don't run on devedition
default: built-projects
@ -61,9 +60,7 @@ gtest:
tier:
by-test-platform:
windows7-32-shippable.*: 3
windows7-32-pgo.*: 3
windows10-64-shippable.*: 3
windows10-64-pgo.*: 3
windows10-64-asan.*: 3
linux.*64-ccov.*/opt: 3
default: default

Просмотреть файл

@ -163,10 +163,10 @@ browser-screenshots:
test-manifest-loader: null # don't load tests in the taskgraph
run-on-projects:
by-test-platform:
windows7-32(?:-pgo|-shippable)(?:-qr)?/opt: ['mozilla-central']
windows10-64(?:-pgo|-shippable)(?:-qr)?/opt: ['mozilla-central']
windows7-32(?:-shippable)(?:-qr)?/opt: ['mozilla-central']
windows10-64(?:-shippable)(?:-qr)?/opt: ['mozilla-central']
(?:windows10-64|windows7-32|linux1804-64|macosx1014-64)(?:-qr)?/opt: ['integration']
linux1804-64-(?:pgo|shippable)(?:-qr)?/opt: ['mozilla-central']
linux1804-64-(?:shippable)(?:-qr)?/opt: ['mozilla-central']
macosx.*64-shippable/opt: ['mozilla-central']
default: []
fission-run-on-projects: []
@ -308,7 +308,7 @@ mochitest-media:
run-on-projects:
by-test-platform:
android-hw-.*(?<!-shippable)(-qr)?/opt: ['autoland']
android-hw-.*-api-16(-qr)?/(?:debug|pgo)?: ['trunk', 'mozilla-beta', 'mozilla-release']
android-hw-.*-api-16(-qr)?/(?:debug)?: ['trunk', 'mozilla-beta', 'mozilla-release']
android-hw-.*-api-16-shippable(-qr)?/opt: ['trunk', 'mozilla-beta', 'mozilla-release']
windows10-aarch64/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
default: built-projects

Просмотреть файл

@ -145,15 +145,6 @@ def filter_by_uncommon_try_tasks(task, optional_filters=None):
def filter_release_tasks(task, parameters):
platform = task.attributes.get("build_platform")
if platform in (
# On beta, Nightly builds are already PGOs
"linux-pgo",
"linux64-pgo",
"win32-pgo",
"win64-pgo",
):
return False
if platform in (
"linux",
"linux64",

Просмотреть файл

@ -820,16 +820,13 @@ def set_target(config, tasks):
def set_treeherder_machine_platform(config, tasks):
"""Set the appropriate task.extra.treeherder.machine.platform"""
translation = {
# Linux64 build platforms for asan and pgo are specified differently to
# Linux64 build platform for asan is specified differently to
# treeherder.
"linux64-pgo/opt": "linux64/pgo",
"macosx1014-64/debug": "osx-10-14/debug",
"macosx1014-64/opt": "osx-10-14/opt",
"macosx1014-64-shippable/opt": "osx-10-14-shippable/opt",
"win64-asan/opt": "windows10-64/asan",
"win64-aarch64/opt": "windows10-aarch64/opt",
"win32-pgo/opt": "windows7-32/pgo",
"win64-pgo/opt": "windows10-64/pgo",
}
for task in tasks:
# For most desktop platforms, the above table is not used for "regular"
@ -892,13 +889,11 @@ def set_tier(config, tasks):
if task["test-platform"] in [
"linux64/opt",
"linux64/debug",
"linux64-pgo/opt",
"linux64-shippable/opt",
"linux64-devedition/opt",
"linux64-asan/opt",
"linux64-qr/opt",
"linux64-qr/debug",
"linux64-pgo-qr/opt",
"linux64-shippable-qr/opt",
"linux1804-64/opt",
"linux1804-64/debug",
@ -911,19 +906,16 @@ def set_tier(config, tasks):
"linux1804-64-tsan/opt",
"windows7-32/debug",
"windows7-32/opt",
"windows7-32-pgo/opt",
"windows7-32-devedition/opt",
"windows7-32-shippable/opt",
"windows10-aarch64/opt",
"windows10-64/debug",
"windows10-64/opt",
"windows10-64-pgo/opt",
"windows10-64-shippable/opt",
"windows10-64-devedition/opt",
"windows10-64-asan/opt",
"windows10-64-qr/opt",
"windows10-64-qr/debug",
"windows10-64-pgo-qr/opt",
"windows10-64-shippable-qr/opt",
"macosx1014-64/opt",
"macosx1014-64/debug",