1
0
Fork 0

Let raptor use the geckoview builds

master
Johan Lorenzo 2019-06-14 13:25:42 +02:00 committed by Sebastian Kaspari
parent 22f39fbebf
commit 2f8dc488bc
4 changed files with 7 additions and 7 deletions

View File

@ -424,7 +424,7 @@ task printBuildVariants {
task printGeckoviewVersions {
doLast {
println "nightly: " + groovy.json.JsonOutput.toJson(GeckoVersions.nightly_version)
println "beta: " + groovy.json.JsonOutput.toJson(GeckoVersions.beta_version)
}
}

View File

@ -85,8 +85,8 @@ def raptor(is_staging):
signing_tasks = {}
other_tasks = {}
geckoview_nightly_version = get_geckoview_versions()['nightly']
mozharness_task_id = fetch_mozharness_task_id(geckoview_nightly_version)
geckoview_beta_version = get_geckoview_versions()['beta']
mozharness_task_id = fetch_mozharness_task_id(geckoview_beta_version)
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')]:

View File

@ -29,7 +29,7 @@ def get_geckoview_versions():
output = _run_gradle_process('printGeckoviewVersions')
versions = {}
for version_type in ('nightly',):
for version_type in ('beta',):
version = _extract_content_from_command_output(output, prefix='{}: '.format(version_type))
version = version.strip('"')
versions[version_type] = version

View File

@ -652,11 +652,11 @@ def schedule_task_graph(ordered_groups_of_tasks):
return full_task_graph
def fetch_mozharness_task_id(geckoview_nightly_version):
nightly_build_id = geckoview_nightly_version.split('.')[-1]
def fetch_mozharness_task_id(geckoview_beta_version):
nightly_build_id = geckoview_beta_version.split('.')[-1]
nightly_date = arrow.get(nightly_build_id, 'YYYYMMDDHHmmss')
raptor_index = 'gecko.v2.mozilla-central.pushdate.{}.{:02}.{:02}.{}.firefox.linux64-debug'.format(
raptor_index = 'gecko.v2.mozilla-beta.pushdate.{}.{:02}.{:02}.{}.firefox.linux64-debug'.format(
nightly_date.year, nightly_date.month, nightly_date.day, nightly_build_id
)
return taskcluster.Index().findTask(raptor_index)['taskId']