Bug 899095 - Switch from http://build.mozilla.org/talos to http://talos-bundles.pvt.b.m.o for talos r=jmaher - a=testing
authorArmen Zambrano Gasparnian <armenzg@mozilla.com>
Wed, 14 Aug 2013 13:45:20 -0400
changeset 153737 932868752f82a0256638a0bd0375699b96e346f5
parent 153736 530cefd1f09ea681e0b8c6cb642468b34d9e1471
child 153738 0cff5d8b98424e6e08c9bd6cdae5c78384365840
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher, testing
bugs899095
milestone25.0a2
Bug 899095 - Switch from http://build.mozilla.org/talos to http://talos-bundles.pvt.b.m.o for talos r=jmaher - a=testing
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": "4063ef2a221e"
     },
     "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