Bug 727903. Remove pageloader.xpi from talos_from_code.py. r=armenzg
authorJeff Hammel <jhammel@mozilla.com>
Thu, 08 Mar 2012 09:52:51 -0500
changeset 88583 9ddf749edcf2c4d7482829329beb63e9134b2464
parent 88582 8219e651919031b7eec9aa82c5c91b5d87db234a
child 88584 08809a43e082ca2b6d00bccd352b873bda140aba
push id6905
push usermbrubeck@mozilla.com
push dateFri, 09 Mar 2012 00:27:20 +0000
treeherdermozilla-inbound@2ea21a51d22a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarmenzg
bugs727903
milestone13.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 727903. Remove pageloader.xpi from talos_from_code.py. r=armenzg
testing/talos/talos.json
testing/talos/talos_from_code.py
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -1,10 +1,6 @@
 {
     "talos.zip": {
         "url": "http://build.mozilla.org/talos/zips/talos.bug732835.zip",
         "path": ""
-    },
-    "pageloader.xpi": {
-        "url": "http://build.mozilla.org/talos/xpis/pageloader.xpi",
-        "path": "talos/page_load_test"
     }
 }
--- a/testing/talos/talos_from_code.py
+++ b/testing/talos/talos_from_code.py
@@ -39,28 +39,28 @@ def main():
     except Exception, e:
         print "ERROR: We tried to download the talos.json file but something failed."
         print "ERROR: %s" % str(e)
         sys.exit(1)
 
     # 3) download the necessary files
     print "INFO: talos.json URL: %s" % options.talos_json_url
     try:
-        for key in ('talos.zip', 'pageloader.xpi',):
-            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
-                download_file(entity["url"], entity["path"], key)
-                print "INFO: %s -> %s" % (entity["url"], os.path.join(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/"
-                print "ERROR: This is only allowed for the certain branches."
-                sys.exit(1)
+        key = 'talos.zip'
+        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
+            download_file(entity["url"], entity["path"], key)
+            print "INFO: %s -> %s" % (entity["url"], os.path.join(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/"
+            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