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

Bug 899095 - Switch to http://talos-bundles.pvt.b.m.o for talos bundles. r=jmaher

Browse Source
This commit is contained in:
Armen Zambrano Gasparnian 2013-08-13 11:06:52 -04:00
parent 5e2d06db88
commit 42bd6a9713
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
testing/talos/talos.json
View File

@ -1,6 +1,6 @@
{
"talos.zip": {
"url": "http://build.mozilla.org/talos/zips/talos.fcbb9d7d3c78.zip",
"url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.fcbb9d7d3c78.zip",
"path": ""
},
"global": {
@ -24,8 +24,8 @@
"tspaint_places_generated_max"
],
"talos_addons": [
"http://build.mozilla.org/talos/profiles/dirtyDBs.zip",
"http://build.mozilla.org/talos/profiles/dirtyMaxDBs.zip"
"http://talos-bundles.pvt.build.mozilla.org/profiles/dirtyDBs.zip",
"http://talos-bundles.pvt.build.mozilla.org/profiles/dirtyMaxDBs.zip"
],
"talos_options": [
"--setPref",
@ -70,12 +70,12 @@
},
"tpn": {
"tests": ["tp5n"],
"pagesets_url": "http://build.mozilla.org/talos/zips/tp5n.zip",
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5n.manifest",
"plugins": {
"32": "http://build.mozilla.org/talos/zips/flash32_10_3_183_5.zip",
"64": "http://build.mozilla.org/talos/zips/flash64_11_0_d1_98.zip"
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
},
"talos_options": [
"--mozAfterPaint",
@ -90,12 +90,12 @@
},
"tp5o": {
"tests": ["tp5o"],
"pagesets_url": "http://build.mozilla.org/talos/zips/tp5n.zip",
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest",
"plugins": {
"32": "http://build.mozilla.org/talos/zips/flash32_10_3_183_5.zip",
"64": "http://build.mozilla.org/talos/zips/flash64_11_0_d1_98.zip"
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
},
"talos_options": [
"--mozAfterPaint",
@ -110,12 +110,12 @@
},
"xperf": {
"tests": ["tp5n"],
"pagesets_url": "http://build.mozilla.org/talos/zips/tp5n.zip",
"pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
"pagesets_parent_dir_path": "talos/page_load_test/",
"pagesets_manifest_path": "talos/page_load_test/tp5n/tp5n.manifest",
"plugins": {
"32": "http://build.mozilla.org/talos/zips/flash32_10_3_183_5.zip",
"64": "http://build.mozilla.org/talos/zips/flash64_11_0_d1_98.zip"
"32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
"64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
},
"talos_options": [
"--mozAfterPaint",

6
testing/talos/talos_from_code.py
View File

@ -57,7 +57,7 @@ def main():
else:
print "ERROR: You have tried to download a file " + \
"from: %s " % fileUrl + \
"which is a location different than http://build.mozilla.org/talos/"
"which is a location different than http://talos-bundles.pvt.build.mozilla.org/"
print "ERROR: This is only allowed for the certain branches."
sys.exit(1)
except Exception, e:
@ -67,13 +67,13 @@ def main():
def passesRestrictions(talosJsonUrl, fileUrl):
'''
Only certain branches are exempted from having to host their downloadable files
in build.mozilla.org
in talos-bundles.pvt.build.mozilla.org
'''
if talosJsonUrl.startswith("http://hg.mozilla.org/try/") == True or \
talosJsonUrl.startswith("http://hg.mozilla.org/projects/pine/") == True:
return True
else:
p = re.compile('^http://build.mozilla.org/talos/')
p = re.compile('^http://talos-bundles.pvt.build.mozilla.org/')
m = p.match(fileUrl)
if m == None:
return False