Use latest Raptor from mozilla-central
parent
d298b5f2f5
commit
d8653818f2
|
@ -15,7 +15,7 @@ import re
|
||||||
|
|
||||||
import taskcluster
|
import taskcluster
|
||||||
|
|
||||||
from lib.gradle import get_variants_for_build_type, get_geckoview_versions
|
from lib.gradle import get_variants_for_build_type
|
||||||
from lib.tasks import (
|
from lib.tasks import (
|
||||||
fetch_mozharness_task_id,
|
fetch_mozharness_task_id,
|
||||||
schedule_task_graph,
|
schedule_task_graph,
|
||||||
|
@ -85,8 +85,7 @@ def raptor(is_staging):
|
||||||
signing_tasks = {}
|
signing_tasks = {}
|
||||||
other_tasks = {}
|
other_tasks = {}
|
||||||
|
|
||||||
geckoview_version = get_geckoview_versions()
|
mozharness_task_id = fetch_mozharness_task_id()
|
||||||
mozharness_task_id = fetch_mozharness_task_id(geckoview_version)
|
|
||||||
gecko_revision = taskcluster.Queue().task(mozharness_task_id)['payload']['env']['GECKO_HEAD_REV']
|
gecko_revision = taskcluster.Queue().task(mozharness_task_id)['payload']['env']['GECKO_HEAD_REV']
|
||||||
|
|
||||||
for variant in [Variant.from_values(abi, False, 'forPerformanceTest') for abi in ('aarch64', 'arm')]:
|
for variant in [Variant.from_values(abi, False, 'forPerformanceTest') for abi in ('aarch64', 'arm')]:
|
||||||
|
|
|
@ -24,18 +24,6 @@ def get_variants_for_build_type(build_type):
|
||||||
if variant_dict['buildType'] == build_type]
|
if variant_dict['buildType'] == build_type]
|
||||||
|
|
||||||
|
|
||||||
def get_geckoview_versions():
|
|
||||||
print("Fetching geckoview version from gradle")
|
|
||||||
output = _run_gradle_process('printGeckoviewVersions')
|
|
||||||
|
|
||||||
version_type = 'release'
|
|
||||||
version = _extract_content_from_command_output(output, prefix='{}: '.format(version_type))
|
|
||||||
version = version.strip('"')
|
|
||||||
print('Got geckoview {} version: "{}"'.format(version_type, version))
|
|
||||||
|
|
||||||
return version
|
|
||||||
|
|
||||||
|
|
||||||
def _run_gradle_process(gradle_command):
|
def _run_gradle_process(gradle_command):
|
||||||
process = subprocess.Popen(["./gradlew", "--no-daemon", "--quiet", gradle_command], stdout=subprocess.PIPE)
|
process = subprocess.Popen(["./gradlew", "--no-daemon", "--quiet", gradle_command], stdout=subprocess.PIPE)
|
||||||
output, err = process.communicate()
|
output, err = process.communicate()
|
||||||
|
|
|
@ -580,7 +580,7 @@ class TaskBuilder(object):
|
||||||
"test_packages_url": "{}/{}/artifacts/public/build/en-US/target.test_packages.json".format(_DEFAULT_TASK_URL, mozharness_task_id),
|
"test_packages_url": "{}/{}/artifacts/public/build/en-US/target.test_packages.json".format(_DEFAULT_TASK_URL, mozharness_task_id),
|
||||||
"installer_url": apk_url,
|
"installer_url": apk_url,
|
||||||
}),
|
}),
|
||||||
"GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/releases/mozilla-release",
|
"GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/mozilla-central",
|
||||||
"GECKO_HEAD_REV": gecko_revision,
|
"GECKO_HEAD_REV": gecko_revision,
|
||||||
"MOZ_AUTOMATION": "1",
|
"MOZ_AUTOMATION": "1",
|
||||||
"MOZ_HIDE_RESULTS_TABLE": "1",
|
"MOZ_HIDE_RESULTS_TABLE": "1",
|
||||||
|
@ -600,7 +600,7 @@ class TaskBuilder(object):
|
||||||
},
|
},
|
||||||
"mounts": [{
|
"mounts": [{
|
||||||
"content": {
|
"content": {
|
||||||
"url": "https://hg.mozilla.org/releases/mozilla-release/raw-file/{}/taskcluster/scripts/tester/test-linux.sh".format(gecko_revision),
|
"url": "https://hg.mozilla.org/mozilla-central/raw-file/{}/taskcluster/scripts/tester/test-linux.sh".format(gecko_revision),
|
||||||
},
|
},
|
||||||
"file": "test-linux.sh",
|
"file": "test-linux.sh",
|
||||||
}]
|
}]
|
||||||
|
@ -654,8 +654,7 @@ def schedule_task_graph(ordered_groups_of_tasks):
|
||||||
return full_task_graph
|
return full_task_graph
|
||||||
|
|
||||||
|
|
||||||
def fetch_mozharness_task_id(geckoview_beta_version):
|
def fetch_mozharness_task_id():
|
||||||
raptor_index = 'gecko.v2.mozilla-release.geckoview-version.{}.mobile.android-x86_64-beta-opt'.format(
|
# We now want to use the latest available raptor
|
||||||
geckoview_beta_version
|
raptor_index = 'gecko.v2.mozilla-central.nightly.latest.mobile.android-x86_64-opt'
|
||||||
)
|
|
||||||
return taskcluster.Index().findTask(raptor_index)['taskId']
|
return taskcluster.Index().findTask(raptor_index)['taskId']
|
||||||
|
|
Loading…
Reference in New Issue