Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 22:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1641948: remove android opt builds from non-mozilla-central branches; reduce frequency of fat-aar builds. r=Callek

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D78547
This commit is contained in:
Ben Hearsum 2020-06-11 19:25:07 +00:00
parent b46ca09637
commit 3f2018eaf1
10 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taskcluster/ci/build-fat-aar/kind.yml
View File

@ -99,3 +99,5 @@ jobs:
config:
- builds/releng_base_android_64_builds.py
- taskcluster_nightly.py
optimization:
push-interval-25: null

6
taskcluster/ci/build/android.yml
View File

@ -74,6 +74,7 @@ android-x86/opt:
treeherder:
platform: android-4-2-x86/opt
symbol: B
run-on-projects: ['mozilla-central']
worker-type: b-linux
worker:
env:
@ -146,11 +147,11 @@ android-api-16/opt:
treeherder:
platform: android-4-0-armv7-api16/opt
symbol: B
run-on-projects: ['mozilla-central']
worker-type: b-linux
worker:
env:
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
actions: [get-secrets, build]
config: ["builds/releng_base_android_64_builds.py"]
@ -198,6 +199,7 @@ android-aarch64/opt:
treeherder:
platform: android-5-0-aarch64/opt
symbol: B
run-on-projects: ['mozilla-central']
worker-type: b-linux
worker:
env:
@ -273,11 +275,11 @@ android-x86_64/opt:
treeherder:
platform: android-5-0-x86_64/opt
symbol: B
run-on-projects: ['mozilla-central']
worker-type: b-linux
worker:
env:
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
actions: [get-secrets, build]
config: ["builds/releng_base_android_64_builds.py"]

3
taskcluster/ci/test/browsertime-mobile.yml
View File

@ -138,7 +138,6 @@ browsertime-tp6m:
by-test-platform:
android-hw-p2-.*-api-16/(?!opt).*: []
android-hw-p2-.*-api-16-shippable/opt: []
android-hw-p2-.*?(?<!-aarch64-shippable)/opt.*: []
android-hw(?!-p2).*(?<!-api-16-shippable)/opt.*: []
default: ['mozilla-central']
default:
@ -162,7 +161,6 @@ browsertime-tp6m:
by-test-platform:
android-hw-p2-.*-api-16/(?!opt).*: []
android-hw-p2-.*-api-16-shippable/opt: []
android-hw-p2-.*?(?<!-aarch64-shippable)/opt.*: []
android-hw(?!-p2).*(?<!-api-16-shippable)/opt.*: []
default: ['mozilla-central']
default:
@ -187,7 +185,6 @@ browsertime-tp6m:
by-test-platform:
android-hw-p2-.*-api-16/(?!opt).*: []
android-hw-p2-.*-api-16-shippable/opt: []
android-hw-p2-.*?(?<!-aarch64-shippable)/opt.*: []
android-hw(?!-p2).*(?<!-api-16-shippable)/opt.*: []
default: ['mozilla-central']
default: []

12
taskcluster/ci/test/mochitest.yml
View File

@ -357,6 +357,10 @@ mochitest-webgl1-core:
by-test-platform:
macosx.*64-ccov/.*: 7200
default: 1800
run-on-projects:
by-test-platform:
android-hw-.*(?<!-shippable)/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
default: built-projects
# Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
allow-software-gl-layers: false
mozharness:
@ -375,6 +379,10 @@ mochitest-webgl1-ext:
loopback-video: true
tier: default
max-run-time: 2700
run-on-projects:
by-test-platform:
android-hw-.*(?<!-shippable)/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
default: built-projects
# Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
allow-software-gl-layers: false
mozharness:
@ -394,6 +402,10 @@ mochitest-webgl2-core:
loopback-video: true
tier: default
max-run-time: 1800
run-on-projects:
by-test-platform:
android-hw-.*(?<!-shippable)/opt: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
default: built-projects
# Bug 1296733: llvmpipe with mesa 9.2.1 lacks thread safety
allow-software-gl-layers: false
mozharness:

1
taskcluster/ci/test/raptor-gve.yml
View File

@ -18,7 +18,6 @@ job-defaults:
by-test-platform:
android-hw-p2-.*-api-16/(?!opt).*: []
android-hw-p2-.*-api-16-shippable/opt: []
android-hw-p2-.*?(?<!-aarch64-shippable)/opt.*: []
android-hw(?!-p2).*(?<!-api-16-shippable)/opt.*: []
default: ['mozilla-central']
target: geckoview_example.apk

28
taskcluster/ci/test/test-platforms.yml
View File

@ -382,8 +382,8 @@ macosx1014-64-ccov/opt:
#
# android-em test platforms execute on android emulators.
android-em-7.0-x86_64/opt:
build-platform: android-x86_64/opt
android-em-7.0-x86_64-shippable/opt:
build-platform: android-x86_64-shippable/opt
test-sets:
- android-x86_64-tests
@ -392,8 +392,8 @@ android-em-7.0-x86_64/debug:
test-sets:
- android-x86_64-tests
android-em-7.0-x86_64-qr/opt:
build-platform: android-x86_64/opt
android-em-7.0-x86_64-shippable-qr/opt:
build-platform: android-x86_64-shippable/opt
test-sets:
- android-x86_64-qr-tests
@ -406,16 +406,6 @@ android-em-7.0-x86_64-qr/debug:
# android-hw-g5-7-0 Motorola Moto G5 Android 7.0
android-hw-g5-7-0-arm7-api-16/opt:
build-platform: android-api-16/opt
test-sets:
- android-hw-arm7-browsertime
- android-hw-arm7-raptor
- android-hw-arm7-raptor-power
- android-hw-arm7-raptor-cpu-memory
- android-hw-arm7-raptor-cpu-memory-power
- raptor-fetch-geckoview
android-hw-g5-7-0-arm7-api-16-shippable/opt:
build-platform: android-api-16-shippable/opt
test-sets:
@ -430,13 +420,9 @@ android-hw-g5-7-0-arm7-api-16-shippable/opt:
android-hw-p2-8-0-arm7-api-16-shippable/opt:
build-platform: android-api-16-shippable/opt
test-sets:
- android-hw-arm7-pgo-unittests
android-hw-p2-8-0-arm7-api-16/opt:
build-platform: android-api-16/opt
test-sets:
- android-hw-arm7-browsertime
- android-hw-arm7-pgo-unittests
- android-hw-arm7-raptor
- android-hw-arm7-raptor-power
- android-hw-arm7-raptor-cpu-memory
@ -448,8 +434,8 @@ android-hw-p2-8-0-arm7-api-16/debug:
test-sets:
- android-hw-arm7-debug-unittests
android-hw-p2-8-0-android-aarch64-qr/opt:
build-platform: android-api-16/opt
android-hw-p2-8-0-android-aarch64-shippable-qr/opt:
build-platform: android-api-16-shippable/opt
test-sets:
- android-hw-aarch64-qr

1
taskcluster/ci/test/web-platform.yml
View File

@ -37,6 +37,7 @@ job-defaults:
- remove_executables.py
target:
by-test-platform:
android-em-7.0-x86_64-shippable/opt: geckoview-androidTest.apk
android-em-7.0-x86_64/opt: geckoview-androidTest.apk
android-em-7.0-x86_64/debug: geckoview-androidTest.apk
default: null

2
taskcluster/ci/webrender/kind.yml
View File

@ -452,7 +452,7 @@ jobs:
MOZ_FETCHES_DIR: fetches
dependencies:
webrender-wrench-android-release: webrender-wrench-android-release
android-build: build-android-aarch64/opt
android-build: build-android-aarch64-shippable/opt
fetches:
webrender-wrench-android-release:
- 'wrench-release.apk'

44
taskcluster/taskgraph/transforms/job/mozharness_test.py
View File

@ -28,6 +28,7 @@ from taskgraph.transforms.job.common import (
VARIANTS = [
'shippable',
'shippable-qr',
'devedition',
'pgo',
'asan',
@ -59,12 +60,25 @@ def test_packages_url(taskdesc):
# for android shippable we need to add 'en-US' to the artifact url
test = taskdesc['run']['test']
if 'android' in test['test-platform'] and (
get_variant(test['test-platform']) in ('shippable', )):
get_variant(test['test-platform']) in ('shippable', 'shippable-qr')):
head, tail = os.path.split(artifact_url)
artifact_url = os.path.join(head, 'en-US', tail)
return artifact_url
def installer_url(taskdesc):
test = taskdesc['run']['test']
mozharness = test['mozharness']
if 'installer-url' in mozharness:
installer_url = mozharness['installer-url']
else:
upstream_task = '<build-signing>' if mozharness['requires-signed-builds'] else '<build>'
installer_url = get_artifact_url(upstream_task, mozharness['build-artifact-name'])
return installer_url
@run_job_using('docker-worker', 'mozharness-test', schema=mozharness_test_run_schema)
def mozharness_test_on_docker(config, job, taskdesc):
run = job['run']
@ -89,10 +103,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
("public/test_info/", "{workdir}/workspace/build/blobber_upload_dir/".format(**run)),
]
if 'installer-url' in mozharness:
installer_url = mozharness['installer-url']
else:
installer_url = get_artifact_url('<build>', mozharness['build-artifact-name'])
installer = installer_url(taskdesc)
mozharness_url = get_artifact_url('<build>',
get_artifact_path(taskdesc, 'mozharness.zip'))
@ -107,7 +118,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
env.update({
'MOZHARNESS_CONFIG': ' '.join(mozharness['config']),
'MOZHARNESS_SCRIPT': mozharness['script'],
'MOZILLA_BUILD_URL': {'task-reference': installer_url},
'MOZILLA_BUILD_URL': {'task-reference': installer},
'NEED_PULSEAUDIO': 'true',
'NEED_WINDOW_MANAGER': 'true',
'ENABLE_E10S': text_type(bool(test.get('e10s'))).lower(),
@ -157,7 +168,7 @@ def mozharness_test_on_docker(config, job, taskdesc):
env['MOZHARNESS_URL'] = {'task-reference': mozharness_url}
extra_config = {
'installer_url': installer_url,
'installer_url': installer,
'test_packages_url': test_packages_url(taskdesc),
}
env['EXTRA_MOZHARNESS_CONFIG'] = {
@ -243,11 +254,7 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
},
]
if 'installer-url' in mozharness:
installer_url = mozharness['installer-url']
else:
upstream_task = '<build-signing>' if mozharness['requires-signed-builds'] else '<build>'
installer_url = get_artifact_url(upstream_task, mozharness['build-artifact-name'])
installer = installer_url(taskdesc)
worker['os-groups'] = test['os-groups']
@ -288,7 +295,7 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
'MOZHARNESS_CONFIG': ' '.join(mozharness['config']),
'MOZHARNESS_SCRIPT': mozharness['script'],
'MOZHARNESS_URL': {'artifact-reference': '<build/public/build/mozharness.zip>'},
'MOZILLA_BUILD_URL': {'task-reference': installer_url},
'MOZILLA_BUILD_URL': {'task-reference': installer},
"MOZ_NO_REMOTE": '1',
"NEED_XVFB": "false",
"XPCOM_DEBUG_BREAK": 'warn',
@ -299,7 +306,7 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
})
extra_config = {
'installer_url': installer_url,
'installer_url': installer,
'test_packages_url': test_packages_url(taskdesc),
}
env['EXTRA_MOZHARNESS_CONFIG'] = {
@ -402,10 +409,7 @@ def mozharness_test_on_script_engine_autophone(config, job, taskdesc):
if worker['os'] != 'linux':
raise Exception('os: {} not supported on script-engine-autophone'.format(worker['os']))
if 'installer-url' in mozharness:
installer_url = mozharness['installer-url']
else:
installer_url = get_artifact_url('<build>', mozharness['build-artifact-name'])
installer = installer_url(taskdesc)
mozharness_url = get_artifact_url('<build>',
'public/build/mozharness.zip')
@ -431,7 +435,7 @@ def mozharness_test_on_script_engine_autophone(config, job, taskdesc):
'MOZHARNESS_CONFIG': ' '.join(mozharness['config']),
'MOZHARNESS_SCRIPT': mozharness['script'],
'MOZHARNESS_URL': {'task-reference': mozharness_url},
'MOZILLA_BUILD_URL': {'task-reference': installer_url},
'MOZILLA_BUILD_URL': {'task-reference': installer},
"MOZ_NO_REMOTE": '1',
"XPCOM_DEBUG_BREAK": 'warn',
"NO_FAIL_ON_TEST_ERRORS": '1',
@ -452,7 +456,7 @@ def mozharness_test_on_script_engine_autophone(config, job, taskdesc):
env['NEED_XVFB'] = 'false'
extra_config = {
'installer_url': installer_url,
'installer_url': installer,
'test_packages_url': test_packages_url(taskdesc),
}
env['EXTRA_MOZHARNESS_CONFIG'] = {

11
taskcluster/taskgraph/transforms/tests.py
View File

@ -854,18 +854,17 @@ def set_treeherder_machine_platform(config, tasks):
platform_new = task['test-platform'].replace('-pgo/opt', '/pgo')
task['treeherder-machine-platform'] = platform_new
elif 'android-em-7.0-x86_64-qr' in task['test-platform']:
opt = task['test-platform'].split('/')[1]
task['treeherder-machine-platform'] = 'android-em-7-0-x86_64-qr/'+opt
task['treeherder-machine-platform'] = task['test-platform'].replace('.', '-')
elif 'android-em-7.0-x86_64-shippable-qr' in task['test-platform']:
task['treeherder-machine-platform'] = task['test-platform'].replace('.', '-')
elif '-qr' in task['test-platform']:
task['treeherder-machine-platform'] = task['test-platform']
elif 'android-hw' in task['test-platform']:
task['treeherder-machine-platform'] = task['test-platform']
elif 'android-em-7.0-x86_64' in task['test-platform']:
opt = task['test-platform'].split('/')[1]
task['treeherder-machine-platform'] = 'android-em-7-0-x86_64/'+opt
task['treeherder-machine-platform'] = task['test-platform'].replace('.', '-')
elif 'android-em-7.0-x86' in task['test-platform']:
opt = task['test-platform'].split('/')[1]
task['treeherder-machine-platform'] = 'android-em-7-0-x86/'+opt
task['treeherder-machine-platform'] = task['test-platform'].replace('.', '-')
# Bug 1602863 - must separately define linux64/asan and linux1804-64/asan
# otherwise causes an exception during taskgraph generation about
# duplicate treeherder platform/symbol.