Backed out 5 changesets (bug 1522111) for breaking windows opt wpts

Backed out changeset aa6103c8ef0f (bug 1522111)
Backed out changeset 14e9ed41b8be (bug 1522111)
Backed out changeset c10783ea070b (bug 1522111)
Backed out changeset cc97d772a8db (bug 1522111)
Backed out changeset 6fbfc8bc2388 (bug 1522111)
This commit is contained in:
Noemi Erli 2019-02-16 00:06:17 +02:00
parent 6ad6b0c64d
commit 7f0a1d33d8
18 changed files with 47 additions and 169 deletions

View File

@ -21,7 +21,6 @@ linux64/opt:
secrets: true
tooltool-downloads: public
need-xvfb: true
run-on-projects: ['mozilla-central', 'try']
toolchains:
- linux64-binutils
- linux64-clang
@ -56,7 +55,7 @@ linux64-plain/opt:
extra-config:
disable_package_metrics: true
mozconfig-variant: plain-opt
run-on-projects: ['mozilla-central', 'try']
run-on-projects: [trunk]
toolchains:
- linux64-binutils
- linux64-clang

View File

@ -62,7 +62,6 @@ win32/opt:
- builds/taskcluster_base_win32.py
extra-config:
stage_platform: win32
run-on-projects: ['mozilla-central', 'try']
toolchains:
- win64-clang-cl
- win64-rust
@ -202,7 +201,7 @@ win64-plain/debug:
disable_package_metrics: true
stage_platform: win64
mozconfig-variant: plain-debug
run-on-projects: ['trunk']
run-on-projects: [trunk]
toolchains:
- win64-clang-cl
- win64-rust
@ -235,7 +234,6 @@ win64/opt:
- builds/taskcluster_base_win64.py
extra-config:
stage_platform: win64
run-on-projects: ['mozilla-central', 'try']
toolchains:
- win64-clang-cl
- win64-rust
@ -272,7 +270,7 @@ win64-plain/opt:
disable_package_metrics: true
stage_platform: win64
mozconfig-variant: plain-opt
run-on-projects: ['mozilla-central', 'try']
run-on-projects: [trunk]
toolchains:
- win64-clang-cl
- win64-rust
@ -425,7 +423,7 @@ win32-add-on-devel/opt:
extra-config:
stage_platform: win32-add-on-devel
mozconfig-variant: add-on-devel
run-on-projects: ['mozilla-beta', 'mozilla-release']
run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
toolchains:
- win64-clang-cl
- win64-rust
@ -459,7 +457,7 @@ win64-add-on-devel/opt:
extra-config:
stage_platform: win64-on-devel
mozconfig-variant: add-on-devel
run-on-projects: ['mozilla-beta', 'mozilla-release']
run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
toolchains:
- win64-clang-cl
- win64-rust

View File

@ -22,12 +22,12 @@ kind-dependencies:
primary-dependency: build
only-for-build-platforms:
- linux64-pgo/opt
- linux64/opt
- linux/opt
- android-api-16/opt
- macosx64/opt
- win32-pgo/opt
- win64-pgo/opt
- win32/opt
- win64/opt
job-template:
description:
@ -78,10 +78,10 @@ job-template:
job-name:
by-build-platform:
linux: linux-opt
linux64.*: linux64-opt
linux64: linux64-opt
macosx64: macosx64-opt
win32.*: win32-opt
win64.*: win64-opt
win32: win32-opt
win64: win64-opt
android-api-16: android-api-16-opt
run-on-projects: ['all']
worker-type:
@ -98,13 +98,10 @@ job-template:
platform:
by-build-platform:
linux64: linux64/opt
linux64-pgo: linux64-pgo/opt
linux: linux32/opt
macosx64: osx-cross/opt
win32: windows2012-32/opt
win32-pgo: windows2012-32-pgo/opt
win64: windows2012-64/opt
win64-pgo: windows2012-64-pgo/opt
android-api-16: android-4-0-armv7-api16/opt
env:
by-build-platform:
@ -134,7 +131,7 @@ job-template:
- single_locale/linux32.py
- single_locale/tc_common.py
- single_locale/tc_linux_common.py
linux64.*:
linux64:
- single_locale/firefox.py
- single_locale/linux64.py
- single_locale/tc_common.py
@ -144,12 +141,12 @@ job-template:
- single_locale/macosx64.py
- single_locale/tc_common.py
- single_locale/tc_macosx64.py
win32.*:
win32:
- single_locale/firefox.py
- single_locale/win32.py
- single_locale/tc_common.py
- single_locale/tc_win32.py
win64.*:
win64:
- single_locale/firefox.py
- single_locale/win64.py
- single_locale/tc_common.py

View File

@ -16,9 +16,9 @@ kind-dependencies:
only-for-build-platforms:
- win32-nightly/opt
- win32-devedition-nightly/opt
- win32-pgo/opt
- win32/opt
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64-pgo/opt
- win64/opt
- win64-aarch64-nightly/opt
- win64-asan-reporter-nightly/opt

View File

@ -24,19 +24,16 @@ only-for-build-platforms:
- linux64-devedition-nightly/opt
- linux64-asan-reporter-nightly/opt
- linux64/opt
- linux64-pgo/opt
- macosx64-nightly/opt
- macosx64-devedition-nightly/opt
- macosx64/opt
- win32-nightly/opt
- win32-devedition-nightly/opt
- win32/opt
- win32-pgo/opt
- win64-nightly/opt
- win64-devedition-nightly/opt
- win64-aarch64-nightly/opt
- win64/opt
- win64-pgo/opt
- win64-asan-reporter-nightly/opt
job-template:

View File

@ -30,4 +30,4 @@ jobs-from:
dependent-build-platforms:
linux64-asan/opt: build-linux64-asan/opt
linux64/debug: build-linux64/debug
linux64.*: build-linux64/pgo
linux64.*: build-linux64/opt

View File

@ -80,7 +80,6 @@ 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
@ -124,7 +123,6 @@ 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

View File

@ -138,10 +138,9 @@ browser-screenshots:
run-on-projects:
by-test-platform:
# We don't want debug, pgo, devedition or nightly builds
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']
windows7-32/opt: ['mozilla-central', 'integration']
windows10-64/opt: ['mozilla-central', 'integration']
linux64/opt: ['mozilla-central', 'integration']
macosx64/opt: ['mozilla-central', 'integration']
default: []
max-run-time: 3600

View File

@ -12,7 +12,6 @@ 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:

View File

@ -32,7 +32,6 @@ 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:
@ -47,10 +46,7 @@ talos-chrome:
description: "Talos chrome"
try-name: chromez
treeherder-symbol: T(c)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time: 1200
mozharness:
extra-options:
@ -64,7 +60,6 @@ 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:
@ -74,10 +69,7 @@ talos-dromaeojs:
description: "Talos dromaeojs"
try-name: dromaeojs
treeherder-symbol: T(d)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time: 2100
mozharness:
extra-options:
@ -88,10 +80,7 @@ talos-flex:
try-name: flex
treeherder-symbol: T(f)
tier: 3
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-central', 'try']
run-on-projects: ['mozilla-central', 'try']
max-run-time: 1800
mozharness:
extra-options:
@ -101,10 +90,7 @@ talos-g1:
description: "Talos g1"
try-name: g1
treeherder-symbol: T(g1)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time:
by-test-platform:
linux64.*: 3600
@ -117,10 +103,7 @@ talos-g3:
description: "Talos g3"
try-name: g3
treeherder-symbol: T(g3)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time: 900
mozharness:
extra-options:
@ -130,10 +113,7 @@ talos-g4:
description: "Talos g4"
try-name: g4
treeherder-symbol: T(g4)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time:
by-test-platform:
linux64.*: 1500
@ -146,10 +126,7 @@ talos-g5:
description: "Talos g5"
try-name: g5
treeherder-symbol: T(g5)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
mozharness:
extra-options:
- --suite=g5
@ -162,10 +139,7 @@ talos-h1:
description: "Talos h1"
try-name: h1
treeherder-symbol: T(h1)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
mozharness:
extra-options:
- --suite=h1
@ -178,10 +152,7 @@ talos-h2:
description: "Talos h2"
try-name: h2
treeherder-symbol: T(h2)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time:
by-test-platform:
linux64.*: 900
@ -194,10 +165,7 @@ talos-motionmark:
description: "Talos motionmark"
try-name: motionmark
treeherder-symbol: T(mm)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-central', 'try']
run-on-projects: ['mozilla-central', 'try']
max-run-time: 3600
tier:
by-test-platform:
@ -212,10 +180,7 @@ talos-other:
description: "Talos other"
try-name: other
treeherder-symbol: T(o)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time: 1500
mozharness:
extra-options:
@ -225,10 +190,7 @@ talos-sessionrestore-many-windows:
description: "Talos sessionrestore-many-windows"
try-name: sessionrestore-many-windows
treeherder-symbol: T(smw)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-central', 'try']
run-on-projects: ['mozilla-central', 'try']
max-run-time: 1500
mozharness:
extra-options:
@ -238,10 +200,7 @@ talos-perf-reftest:
description: "Talos perf-reftest"
try-name: perf-reftest
treeherder-symbol: T(p)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['trunk', 'try']
run-on-projects: ['trunk', 'try']
max-run-time: 1200
mozharness:
extra-options:
@ -251,10 +210,7 @@ talos-perf-reftest-singletons:
description: "Talos perf-reftest singletons"
try-name: perf-reftest-singletons
treeherder-symbol: T(ps)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['trunk', 'try']
run-on-projects: ['trunk', 'try']
max-run-time: 1200
mozharness:
extra-options:
@ -264,10 +220,7 @@ talos-speedometer:
description: "Talos speedometer"
try-name: speedometer
treeherder-symbol: T(sp)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time: 1500
mozharness:
extra-options:
@ -277,10 +230,7 @@ talos-svgr:
description: "Talos svgr"
try-name: svgr
treeherder-symbol: T(s)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time: 1800
mozharness:
extra-options:
@ -290,10 +240,7 @@ talos-tp5o:
description: "Talos tp5o"
try-name: tp5o
treeherder-symbol: T(tp)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['mozilla-beta', 'trunk', 'try']
run-on-projects: ['mozilla-beta', 'trunk', 'try']
max-run-time: 1800
mozharness:
extra-options:
@ -303,10 +250,7 @@ talos-tp6:
description: "Talos tp6"
try-name: tp6
treeherder-symbol: T(tp6)
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
default: ['trunk', 'try']
run-on-projects: ['trunk', 'try']
max-run-time: 1200
mozharness:
extra-options:
@ -320,7 +264,6 @@ 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:
@ -334,7 +277,6 @@ 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:
@ -353,10 +295,9 @@ talos-xperf:
windows10-64.*: true
run-on-projects:
by-test-platform:
(?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
windows7-32(-pgo)?/.*: ['mozilla-beta', 'trunk', 'try']
windows10-aarch64/opt: []
windows7-32-pgo(?:-qr)?/.*: ['mozilla-beta', 'trunk', 'try']
windows10-64-(?!qr).*/opt: ['mozilla-beta', 'trunk', 'try']
windows10-64.*/opt: ['mozilla-beta', 'trunk', 'try']
default: []
tier:
by-test-platform:

View File

@ -80,12 +80,7 @@ linux64-pgo/opt:
test-sets:
- common-tests
- web-platform-tests
- opt-only-tests
- desktop-screenshot-capture
- talos
- awsy
- mochitest-headless
- linux-talos-flex
- raptor-firefox
- raptor-fetch-firefox
@ -111,15 +106,6 @@ 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:
@ -242,11 +228,11 @@ windows10-64-pgo/opt:
test-sets:
- awsy
- desktop-screenshot-capture
- marionette-gpu-tests
- windows-talos
- marionette-gpu-tests
- windows-tests
- web-platform-tests
- mochitest-headless
- raptor-firefox
windows10-64-nightly/opt:
@ -290,15 +276,6 @@ 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.*/)

View File

@ -192,7 +192,6 @@ 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

View File

@ -13,8 +13,7 @@ NON_NIGHTLY_LABELS_WHICH_SHOULD_SIGN_BUILDS = (
'build-win64/debug', 'build-win64/opt', 'build-win64/pgo',
'build-win32-devedition/opt', 'build-win64-devedition/opt',
'build-win64-ccov/debug',
'build-linux/opt', 'build-linux64/opt', 'build-linux64/pgo',
'build-macosx64/opt',
'build-linux/opt', 'build-linux64/opt', 'build-macosx64/opt',
'build-android-api-16/opt'
'release-source-linux64-source/opt',
'release-source-linux64-fennec-source/opt',

View File

@ -282,7 +282,6 @@ def handle_artifact_prefix(config, jobs):
def all_locales_attribute(config, jobs):
for job in jobs:
locales_platform = job['attributes']['build_platform'].replace("-nightly", "")
locales_platform = locales_platform.replace("-pgo", "")
locales_with_changesets = parse_locales_file(job["locales-file"],
platform=locales_platform)
locales_with_changesets = _remove_locales(locales_with_changesets,

View File

@ -222,7 +222,8 @@ def make_job_description(config, jobs):
treeherder.setdefault('symbol', 'Nr')
else:
treeherder.setdefault('symbol', 'Rpk')
dep_th_platform = dep_job.task.get('extra', {}).get('treeherder-platform')
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform', "{}/opt".format(dep_th_platform))
treeherder.setdefault('tier', 1)
treeherder.setdefault('kind', 'build')

View File

@ -51,7 +51,8 @@ def make_repackage_signing_description(config, jobs):
treeherder.setdefault('symbol', 'rs(N)')
else:
treeherder.setdefault('symbol', 'rs(B)')
dep_th_platform = dep_job.task.get('extra', {}).get('treeherder-platform')
dep_th_platform = dep_job.task.get('extra', {}).get(
'treeherder', {}).get('machine', {}).get('platform', '')
treeherder.setdefault('platform',
"{}/opt".format(dep_th_platform))
treeherder.setdefault(

View File

@ -112,11 +112,6 @@ 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',
@ -650,7 +645,6 @@ 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',
@ -665,7 +659,6 @@ 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',

View File

@ -76,27 +76,8 @@ class SETA(object):
if type(low_value_tasks[0]) == list:
low_value_tasks = [self._get_task_string(x) for x in low_value_tasks]
# hack seta tasks to run 'opt' jobs on 'pgo' builds - see Bug 1522111
def opt_to_pgo(label):
opt = ['test-windows10-64/opt',
'test-windows7-32/opt',
'test-linux64/opt',
'test-windows10-64-qr/opt',
'test-windows7-32-qr/opt',
'test-linux64-qr/opt']
pgo = ['test-windows10-64-pgo/opt',
'test-windows7-32-pgo/opt',
'test-linux64-pgo/opt',
'test-windows10-64-pgo-qr/opt',
'test-windows7-32-pgo-qr/opt',
'test-linux64-pgo-qr/opt']
for iter in range(0, len(opt)):
if label.startswith(opt[iter]):
label = label.replace(opt[iter], pgo[iter])
return label
# ensure no build tasks slipped in, we never want to optimize out those
low_value_tasks = [opt_to_pgo(x) for x in low_value_tasks if 'build' not in x]
low_value_tasks = [x for x in low_value_tasks if 'build' not in x.lower()]
# In the event of request times out, requests will raise a TimeoutError.
except exceptions.Timeout: