Bug 899095 - Switch to http://talos-bundles.pvt.b.m.o for talos bundles. r=jmaher
authorArmen Zambrano Gasparnian <armenzg@mozilla.com>
Tue, 13 Aug 2013 11:06:52 -0400
changeset 142413 d5a9b3ef17063aeeacfe8dd08a2eb90f028dfd8a
parent 142412 925bd252ae58b0255f31032d0ca13524073dd428
child 142414 2957b7bea258b9bcda7c859e7526bff8b37a8d85
push id32392
push userarmenzg@mozilla.com
push dateTue, 13 Aug 2013 15:06:55 +0000
treeherdermozilla-inbound@d5a9b3ef1706 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs899095
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 899095 - Switch to http://talos-bundles.pvt.b.m.o for talos bundles. r=jmaher
testing/talos/talos.json
testing/talos/talos_from_code.py
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -1,11 +1,11 @@
 {
     "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": {
         "talos_repo": "http://hg.mozilla.org/build/talos",
         "talos_revision": "592a42000e98"
     },
     "suites": {
         "chromez": {
@@ -19,18 +19,18 @@
             ]
         },
         "dirtypaint": {
             "tests": [
                 "tspaint_places_generated_med",
                 "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",
                 "hangmonitor.timeout=0",
                 "--mozAfterPaint"
             ]
         },
         "dromaeojs": {
@@ -65,62 +65,62 @@
                 "--filter",
                 "ignore_first:5",
                 "--filter",
                 "median"
             ]
         },
         "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",
                 "--responsiveness",
                 "--filter",
                 "ignore_first:5",
                 "--filter",
                 "median",
                 "--test_timeout",
                 "3600"
             ]
         },
         "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",
                 "--responsiveness",
                 "--filter",
                 "ignore_first:5",
                 "--filter",
                 "median",
                 "--test_timeout",
                 "3600"
             ]
         },
         "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",
                 "--xperf_path",
                 "\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\"",
                 "--filter",
                 "ignore_first:5",
                 "--filter",
--- a/testing/talos/talos_from_code.py
+++ b/testing/talos/talos_from_code.py
@@ -52,33 +52,33 @@ def main():
         entity = get_value(jsonFilename, key)
         if passesRestrictions(options.talos_json_url, entity["url"]):
             # the key is at the same time the filename e.g. talos.zip
             print "INFO: Downloading %s as %s" % (entity["url"], os.path.join(entity["path"], key))
             download_file(entity["url"], entity["path"], key)
         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:
         print "ERROR: %s" % str(e)
         sys.exit(1)
 
 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
         return True
 
 def get_filename_from_url(url):
     '''
     This returns the filename of the file we're trying to download