mozilla-central: changeset 193601:11f7830bc276e5d73c0cd8bb18d36762f1ff7823

author	Joel Maher <jmaher@mozilla.com>
	Fri, 11 Jul 2014 10:51:12 -0400
changeset 193601	11f7830bc276e5d73c0cd8bb18d36762f1ff7823
parent 193600	1e19958b0386d5ebd3d5363d18436c6cea6325b9
child 193602	9396c2c95b0036b703e609e2f1578b8c6a0f7a91
push id	27123
push user	ryanvm@gmail.com
push date	Fri, 11 Jul 2014 20:35:05 +0000
treeherder	mozilla-central@84bd8d9f4256 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	avih
bugs	1037375
milestone	33.0a1
first release with	nightly linux32 b0701d069bf9 / 33.0a1 / 20140712030202 / files nightly linux64 b0701d069bf9 / 33.0a1 / 20140712030202 / files nightly mac b0701d069bf9 / 33.0a1 / 20140712030202 / files nightly win32 b0701d069bf9 / 33.0a1 / 20140712030202 / files nightly win64 b0701d069bf9 / 33.0a1 / 20140712030202 / files
last release without	nightly linux32 e1a037c085d1 / 33.0a1 / 20140711030201 / files nightly linux64 e1a037c085d1 / 33.0a1 / 20140711030201 / files nightly mac e1a037c085d1 / 33.0a1 / 20140711030201 / files nightly win32 e1a037c085d1 / 33.0a1 / 20140711030201 / files nightly win64 e1a037c085d1 / 33.0a1 / 20140711030201 / files

--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -1,16 +1,16 @@
 {
     "talos.zip": {
-        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.3a6a28b96228.zip",
+        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.b826a38ef31f.zip",
         "path": ""
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "3a6a28b96228"
+        "talos_revision": "b826a38ef31f"
     },
     "suites": {
         "chromez": {
             "tests": ["tresize", "tcanvasmark"]
         },
         "dirtypaint": {
             "tests": ["tspaint_places_generated_med", "tspaint_places_generated_max"],
             "talos_addons": [
@@ -26,17 +26,24 @@
         },
         "other_nol64": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
         },
         "other_l64": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "media_tests"]
         },
         "g1": {
-            "tests": ["tp5o_scroll"]
+            "tests": ["tp5o_scroll", "glterrain"],
+            "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://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"
+            }
         },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
         },
         "tp5o": {
             "tests": ["tp5o"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
             "pagesets_parent_dir_path": "talos/page_load_test/",