Merge mozilla-central to autoland
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 26 Jul 2017 17:10:11 +0200
changeset 616205 f1693d664f8e8ee4c79801630c181c28095cad56
parent 616204 dff1bf7903c2d8e97f4f5fb8aec7524309ce55ca (current diff)
parent 615935 388d81ed93fa640f91d155f36254667c734157cf (diff)
child 616206 e4e70a229f5e71859aecd7299dbcfd30f03fc9ac
child 616431 b9a1b7f00a26266963bb6bc5a8546612b2469b1c
child 616435 1bfd37fe33116abda30c0d69133e4b6c1f024372
child 616439 8d9770e284185c80c7de10d6a709166f1ce4b4d3
child 616475 308b7961629dafc2e3fea31195290e024e4b4329
child 616484 8e5a02568f0fc83ae5f5eed0bda9c000213a11e1
child 616489 bf0285161c518d5e660c53321219443a10cb5c2d
child 616500 b1247cd90dc162528394476c7677c289753af7ab
child 616501 7732a25195be1bf3c1260ab9847b880bf1848552
child 616505 8f0d35fa61d9c3f3e5bde92e929e03155b7ec16a
child 616520 976a4133f0311690a300b91bf018308aaf08f488
child 616525 7d4ef53751aacea7b160ff6808cc85c77615a99f
child 616526 cb1228dcd6923884e3304c7b51851dee07964706
child 616558 31c0ef4a44caf2c84c7df55822880d451d5cf6fd
child 616560 dbf4d05814be4eeb7d916efc5221851f5f300433
child 616569 88d8336b3ebb887e9c1db2756307d8db3323a7b2
child 616572 9adbf225f0aadd7987a89d6af39c04e462890f51
child 616578 b6e7110ae165c9cd3c6e85dd9676388fb1569614
child 616579 35b0bdaacb0d75ca40d9850475eb55a4d6111a66
child 616605 46f8361c6aa7072f1ed9dd303794c64aab24ba56
child 616607 f6b868ec2d0d95f70fcd2432daef8611cb8a0e6c
child 616610 a0b51c9fd942ebaeaf5fd6db2622a4807d5f1cd3
child 616613 6c7289d1f06afdece0e77fb3c7617f6fe3c6fcdc
child 616618 5d1842ce7189a62429d72142db1c6804129f7832
child 616621 e0f6b26e503df0cbac3510e7209d71b288f76a49
child 616622 f8ec127d9ac6267e8dba54a1b3142d954f064ad0
child 616623 d7245c3c20330a0ff07d84b486bf91952ac44cd8
child 616624 ea4f7eda4a5df05bc5642d34e238f094679f48bb
child 616653 e347329ae6e8c1045179fcbb5f9ae919ddcf52bb
child 616655 dca02eda277544d4086475d83c29838930a332b5
child 616657 cb8ad2e0c556b6d5a16c3ce5198cc9b0a5ae398b
child 616661 e77019903ea17f349dacc411f02e7d599c13e954
child 616662 c64b2d6bc4c3300fbcab6a013bc141fda51989a7
child 616668 100de756543e1f23c11a66b0de75fd953c9eed70
child 616673 ed66218d9c5ffa9f0daccaf1c13aa7772d126563
child 616682 94f31d834f250bf2d085a5b3a465a04d35f7dca1
child 616695 c6f3127fb00f6264a6160d04cb2ed386177466b0
child 616697 452fb393760152868a00da65a2c1bb5741ecdbfc
child 616699 fff2ad8163c039df420dd8ff3dee0ffcaf0d24c5
child 616701 ff563ee461eeda9574f29038adc618531617463f
child 616715 696e9f5b9ac71825c30ed764e2786da795dba8ea
child 617032 9816d289ca0dbea2b11592b1aa37f10427d57597
child 617035 3c9c05442904067b7ee663a57946798d10447eed
child 617050 5b3987556d08051e3db494e1db2e3abe1596b50e
child 617053 a1e8cf082b5c830dc4845d5647a47c9976e58de6
child 617061 8a63ca2f09db196a9802fd127fb19bd1f8837315
child 617112 b056318dd61366ed34be25f413dd3be0ac234608
child 617123 eaeac18e6d0cab5d6c686dd78b1db25c8a4ad272
child 617129 4a401b982d66f1dc9cd66472de19dbe1683d7856
child 617158 4192330a8b2c81487ffefc7984049f2b4ea548f1
child 617167 6c910d553d59e990fac3902b8dbd448f53508bce
child 617168 15d2082612415363e0f69a1880efb702adcece24
child 617183 7c1569472f912c1158090ef0ceafd0cd1a1041bc
child 617185 f80aad877ff2aa5f7a2be14ea282b68417501329
child 617222 c4f6ebb339d2133705e1fadb5d2ae5380e568a85
child 617264 2a890a582c3199478a7b681e4989b21d81437238
child 617273 cdd3f82dbf93f1632a06b52071f717eac3f044b0
child 617281 1f8cc7d08c54a94795dd026a60d8fdeb8f675fdf
child 617290 ab56763f8cc19ca14e0213a305aa3ddc5c7d64a0
child 617319 94744aad273a929b8963caa803d7cb3ecacaaea0
child 618193 9e663b55519c0428ae986bc471b0488004556031
child 618215 2624e1d9a23adaac88395c6dc6c3bf047c5eaf0c
child 618299 3435e2b813e9efbff07e4dbe1a0f211ca03d5ec4
child 618300 496e59f3e227d49c5fc1a763f7acca8804d106ef
child 618302 8c5f5e53f4f05d023de7289e9cc54ff5db696c40
child 618308 7224faa7a998a5d1b3c06c8e51d50add2aa894bc
child 618311 a4f45af5799ea9e765326eb1a5731a5714adc531
child 618313 3b62681375a9a8bc4e27241f34b48b4a8a97e1ac
child 618317 31568cb9a2ac5d2d18b989fbe545d278af97f159
child 618868 0354f4dc0a72c84a7eea5f43884d81668cdc8b05
child 618869 1c34c4ea0dd92fff366014b4c2d8d4bd2f625108
child 618941 1985c8e1a541c3b53424c148769c4726885c62c3
child 618990 9924a2e3eea481c0141688acd5e715d16a3884ec
child 619551 44f972111213118864e4490cd20ad8410a8fb5d6
child 620172 9266f288c1ad6cfae09cb35f0493ddc84d3d35bd
child 620185 d25e3fa714edada5dc01877fe84b58d077a1682b
child 620355 ec2390d29d9c50e6f3904f29e0f736de49a77f72
child 620356 0dbee66fb7f504c634ff140adfeead0191b1c9ba
child 620412 63b6bc893f6f83e6f5ef694012266283add9cfa8
child 620993 5ded597844ddfa1019a42192a2f0df342c8ecfba
child 641495 94890c34f19f9b13b48acbb99bd4e7938cd238c2
child 642428 efafc4a432ab412ecef3c3f3ec7afe7ba1c6c633
child 642433 44084b7ea4f379ddfb18e14bd1175530f8e76511
child 642480 17a586fc5070fc2a66c63f2476e66a3613c00b2c
child 642622 e4aa2bd0039b8359fb824891e33cc05c5d68d48a
child 643051 bd3ff536ced3d37990ccc588fa92410f8277f1d1
child 645793 041f84a86917c90efb91d2155066b89a5122e011
child 647231 406b63c902f9d4d8dede9f29e367f7bdb9d9e159
child 647366 446e3ba7fd854bd4e13226382d99033e6fc456e6
child 647370 fbd9cb07351b56766a59ef38abd77b28af37e324
child 648092 115704df57c8aeebce5e18f3d02f579a3874933d
child 648152 7e8ea83c805d37973e92d0e887c32ec9045b223b
child 648653 1930de7bbf632ba76ef734072b931076eeec3b2e
child 649762 97baa994df061b365c3ae76365f7c728de10cd6b
child 650064 1319d569146c6c07aa80bf0170b16b7e52a53dd0
child 653363 da2bc3f9310375aaca869aec71e99676c5388a7c
push id70636
push userhikezoe@mozilla.com
push dateWed, 26 Jul 2017 21:50:17 +0000
milestone56.0a1
Merge mozilla-central to autoland
taskcluster/taskgraph/transforms/tests.py
--- a/.cron.yml
+++ b/.cron.yml
@@ -34,18 +34,24 @@ jobs:
             # No default
 
     - name: nightly-desktop-win
       job:
           type: decision-task
           treeherder-symbol: Nd-Win
           target-tasks-method: nightly_win
       run-on-projects:
+          - mozilla-central
           - date
-      when: [] # never (hook only)
+      when:
+          by-project:
+            # Match buildbot starts for now
+            date: [{hour: 15, minute: 0}]
+            mozilla-central: [{hour: 10, minute: 0}]
+            # No default
 
     - name: nightly-android
       job:
           type: decision-task
           treeherder-symbol: Na
           target-tasks-method: nightly_fennec
       run-on-projects:
           - mozilla-central
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -21,17 +21,17 @@ win32/debug:
 win32/opt:
     description: "Win32 Opt"
     index:
         product: firefox
         job-name: win32-opt
     treeherder:
         platform: windows2012-32/opt
         symbol: tc(B)
-        tier: 2
+        tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
@@ -63,17 +63,17 @@ win32-dmd/opt:
 win32/pgo:
     description: "Win32 Opt PGO"
     index:
         product: firefox
         job-name: win32-pgo
     treeherder:
         platform: windows2012-32/pgo
         symbol: tc(B)
-        tier: 2
+        tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 9000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
         options: [enable-pgo]
@@ -104,17 +104,17 @@ win64/debug:
 win64/opt:
     description: "Win64 Opt"
     index:
         product: firefox
         job-name: win64-opt
     treeherder:
         platform: windows2012-64/opt
         symbol: tc(B)
-        tier: 2
+        tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
@@ -138,28 +138,70 @@ win64-dmd/opt:
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_firefox_windows_64_opt.py
         custom-build-variant-cfg: dmd
     run-on-projects: [ ]
 
+win32-devedition/opt:
+    description: "Win32 Dev Edition Opt"
+    index:
+        product: devedition
+        job-name: win32-devedition-opt
+    treeherder:
+        platform: windows2012-32-devedition/opt
+        symbol: tc(B)
+        tier: 1
+    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker:
+        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
+    run:
+        using: mozharness
+        script: mozharness/scripts/fx_desktop_build.py
+        config:
+            - builds/taskcluster_firefox_windows_32_opt.py
+    run-on-projects: ['mozilla-beta', ]
+
+win64-devedition/opt:
+    description: "Win64 Dev Edition Opt"
+    index:
+        product: devedition
+        job-name: win64-devedition-opt
+    treeherder:
+        platform: windows2012-64-devedition/opt
+        symbol: tc(B)
+        tier: 1
+    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker:
+        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
+    run:
+        using: mozharness
+        script: mozharness/scripts/fx_desktop_build.py
+        config:
+            - builds/taskcluster_firefox_windows_64_opt.py
+    run-on-projects: ['mozilla-beta', ]
+
 win32-nightly/opt:
     description: "Win32 Nightly"
     index:
         product: firefox
         job-name: win32-opt
         type: nightly
     attributes:
         nightly: true
     treeherder:
         platform: windows2012-32/opt
         symbol: tc(N)
-        tier: 2
+        tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
         actions: [clone-tools, build, check-test, update]
@@ -175,17 +217,17 @@ win64-nightly/opt:
         product: firefox
         job-name: win64-opt
         type: nightly
     attributes:
         nightly: true
     treeherder:
         platform: windows2012-64/opt
         symbol: tc(N)
-        tier: 2
+        tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
         actions: [clone-tools, build, check-test, update]
@@ -198,17 +240,17 @@ win64-nightly/opt:
 win64/pgo:
     description: "Win64 Opt PGO"
     index:
         product: firefox
         job-name: win64-pgo
     treeherder:
         platform: windows2012-64/pgo
         symbol: tc(B)
-        tier: 2
+        tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
         options: [enable-pgo]
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -139,91 +139,111 @@ windows7-32/debug:
         - headless
         - windows-tests
 windows7-32/opt:
     build-platform: win32/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - headless
-        #- windows-talos
+        - windows-talos
         - windows-tests
 
 windows7-32-pgo/opt:
     build-platform: win32-pgo/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - headless
         - windows-tests
-        #- windows-talos
+        - windows-talos
 
 windows7-32-nightly/opt:
     build-platform: win32-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - headless
         - windows-tests
 
+windows7-32-devedition/opt:
+    build-platform: win32-devedition/opt
+    test-sets:
+        - awsy
+        - desktop-screenshot-capture
+        - headless
+        - windows-tests
+
 # win64
 windows10-64/debug:
     build-platform: win64/debug
     test-sets:
         - headless
         - windows-tests
+
 windows10-64/opt:
     build-platform: win64/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - headless
-        #- windows-talos
+        - windows-talos
         - windows-tests
 
 windows10-64-pgo/opt:
     build-platform: win64-pgo/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - headless
-        #- windows-talos
+        - windows-talos
         - windows-tests
 
 windows10-64-nightly/opt:
     build-platform: win64-nightly/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - headless
         - windows-tests
 
+windows10-64-devedition/opt:
+    build-platform: win64-devedition/opt
+    test-sets:
+        - awsy
+        - desktop-screenshot-capture
+        - headless
+        - windows-tests
+
 windows10-64-asan/opt:
     build-platform: win64-asan/opt
     test-sets:
         - common-tests
 
 # Windows8 tests; all via BBB
-# Disabled until flag day
 windows8-64/debug:
     build-platform: win64/debug
-    test-sets: []
-        #- windows8-tests
+    test-sets:
+        - windows8-tests
 windows8-64/opt:
     build-platform: win64/opt
-    test-sets: []
-        #- windows8-tests
+    test-sets:
+        - windows8-tests
 windows8-64-pgo/opt:
     build-platform: win64-pgo/opt
-    test-sets: []
-        #- windows8-tests
+    test-sets:
+        - windows8-tests
 windows8-64-nightly/opt:
     build-platform: win64-nightly/opt
-    test-sets: []
-        #- windows8-tests
+    test-sets:
+        - windows8-tests
+windows8-64-devedition/opt:
+    build-platform: win64-devedition/opt
+    test-sets:
+        - windows8-tests
 
 ##
 # MacOS X platforms (matching /macosx.*/)
 
 macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
         - macosx64-tests
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -250,8 +250,9 @@ windows8-tests:
     - mochitest-devtools-chrome
     - mochitest-media
     - reftest
     - reftest-no-accel
     - mochitest-gpu
     - mochitest-webgl
     - mochitest-clipboard
     - mochitest-chrome
+    - xpcshell
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -4,17 +4,16 @@
 # for a description of the fields used here.
 
 # Note that these are in lexical order, as enforced by the task loader.
 
 awsy:
     description: "Are we slim yet"
     suite: awsy
     treeherder-symbol: tc-SY(sy)
-    run-on-projects: ['release', 'trunk', 'try']
     docker-image: {"in-tree": "desktop1604-test"}
     max-run-time: 7200
     e10s: true
     instance-size: xlarge
     allow-software-gl-layers: false
     mozharness:
         script: awsy_script.py
         config:
@@ -179,16 +178,17 @@ gtest:
     suite: gtest
     treeherder-symbol: tc(GTest)
     e10s: false
     instance-size: xlarge
     docker-image: {"in-tree": "desktop1604-test"}
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
+            windows.*-pgo/.*: [] # permafails on pgo
             default: built-projects
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
@@ -297,17 +297,16 @@ jsreftest:
                     - --reftest-suite=jsreftest
     when:
         files-changed:
             - js/src/**
             - js/public/**
     tier:
         by-test-platform:
             linux64-qr/.*: 1
-            windows10-64/.*: 3
             default: default
 
 marionette:
     description: "Marionette unittest run"
     suite: marionette
     treeherder-symbol: tc(Mn)
     max-run-time:
         by-test-platform:
@@ -316,17 +315,16 @@ marionette:
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     docker-image: {"in-tree": "desktop1604-test"}
     tier:
         by-test-platform:
             android.*: 2
-            windows10.*: 3
             default: default
     chunks:
         by-test-platform:
             android.*: 10
             default: 1
     e10s:
         by-test-platform:
             macosx.*: true
@@ -368,19 +366,16 @@ marionette-headless:
         by-test-platform:
             default: default
     chunks:
         by-test-platform:
             default: 1
     e10s:
         by-test-platform:
             default: both
-    run-on-projects:
-        by-test-platform:
-            default: ['all']
     mozharness:
         by-test-platform:
             default:
                 script: marionette.py
                 no-read-buildbot-config: true
                 config:
                     by-test-platform:
                         windows.*:
@@ -564,16 +559,18 @@ mochitest-browser-screenshots:
     suite: mochitest/browser-chrome-screenshots
     treeherder-symbol: tc-M(ss)
     loopback-video: true
     run-on-projects:
         by-test-platform:
             windows.*/opt: ['mozilla-central', 'try']
             linux64/opt: ['mozilla-central', 'try']
             macosx.*/opt: ['mozilla-central', 'try']
+            windows7-32-devedition/opt: []
+            windows10-64-devedition/opt: []
             default: []
     e10s: both
     max-run-time: 3600
     mozharness:
         mochitest-flavor: browser
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
@@ -605,17 +602,17 @@ mochitest-chrome:
         by-test-platform:
             android-4.3-arm7-api-15/debug: 4
             android.*: 2
             default: 3
     max-run-time: 3600
     e10s: false
     run-on-projects:
         by-test-platform:
-            windows.*: ['try']
+            windows7-32.*: ['try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows7-32.*: buildbot-bridge/buildbot-bridge
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     mozharness:
         by-test-platform:
@@ -1120,16 +1117,17 @@ reftest-gpu:
     docker-image: {"in-tree": "desktop1604-test"}
     run-on-projects:
         by-test-platform:
             windows10.*: []
             windows8-64.*: []
             default: built-projects
     worker-type:
         by-test-platform:
+            windows7-32.*/debug: buildbot-bridge/buildbot-bridge
             default: null
     instance-size:
         by-test-platform:
             default: default
     virtualization: virtual-with-gpu
     max-run-time:
         by-test-platform:
             default: 3600
@@ -1268,17 +1266,16 @@ talos-chrome:
     suite: talos
     try-name: chromez
     treeherder-symbol: tc-T(c)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1298,17 +1295,16 @@ talos-dromaeojs:
     suite: talos
     try-name: dromaeojs
     treeherder-symbol: tc-T(d)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1328,17 +1324,16 @@ talos-g1:
     suite: talos
     try-name: g1
     treeherder-symbol: tc-T(g1)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 7200
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1359,17 +1354,16 @@ talos-g2:
     try-name: g2
     treeherder-symbol: tc-T(g2)
     virtualization: hardware
     max-run-time: 7200
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1417,17 +1411,16 @@ talos-g4:
     suite: talos
     try-name: g4
     treeherder-symbol: tc-T(g4)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1447,17 +1440,16 @@ talos-g5:
     suite: talos
     try-name: g5
     treeherder-symbol: tc-T(g5)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1478,17 +1470,16 @@ talos-other:
     suite: talos
     try-name: other
     treeherder-symbol: tc-T(o)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1508,17 +1499,16 @@ talos-perf-reftest:
     suite: talos
     try-name: perf-reftest
     treeherder-symbol: tc-T(p)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central', 'try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1530,28 +1520,28 @@ talos-perf-reftest:
             - --suite=perf-reftest
 
 talos-perf-reftest-singletons:
     description: "Talos perf-reftest singletons"
     suite: talos
     try-name: perf-reftest-singletons
     treeherder-symbol: tc-T(ps)
     virtualization: hardware
-    run-on-projects: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
-                    - talos/windows_taskcluster_config.py
+                    - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=perf-reftest-singletons
 
 talos-quantum-pageload:
     description: "Talos quantum-pageload"
     suite: talos
@@ -1594,33 +1584,32 @@ talos-quantum-pageload-stylo:
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
                 windows.*:
-                    - talos/windows_taskcluster_config.py
+                    - talos/windows_config.py
                 default:
                     - talos/linux_config.py
         extra-options:
             - --suite=quantum-pageload-stylo
 
 talos-svgr:
     description: "Talos svgr"
     suite: talos
     try-name: svgr
     treeherder-symbol: tc-T(s)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1640,17 +1629,16 @@ talos-tp5o:
     suite: talos
     try-name: tp5o
     treeherder-symbol: tc-T(tp)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
-            windows.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -1802,33 +1790,37 @@ xpcshell:
             linux64-jsdcov/opt: xpcshell-coverage
             default: xpcshell
     treeherder-symbol: tc-X(X)
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
             windows10-64-asan/opt: []  # No XPCShell on ASAN yet
             default: built-projects
+    worker-type:
+        by-test-platform:
+            windows8-64.*: buildbot-bridge/buildbot-bridge
+            default: null
     docker-image: {"in-tree": "desktop1604-test"}
+    tier:
+        by-test-platform:
+            windows10-64.*: 2
+            default: default
     chunks:
         by-test-platform:
             linux64/debug: 10
             android-4.2-x86/opt: 6
             macosx.*: 1
             windows.*: 1
             default: 8
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: legacy # Bug 1281241: migrating to m3.large instances
     max-run-time: 5400
-    tier:
-        by-test-platform:
-            windows.*: 3
-            default: default
     e10s: false
     allow-software-gl-layers: false
     mozharness:
         by-test-platform:
             android.*:
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 extra-options:
--- a/taskcluster/taskgraph/loader/build_signing.py
+++ b/taskcluster/taskgraph/loader/build_signing.py
@@ -6,16 +6,17 @@ from __future__ import absolute_import, 
 
 from taskgraph.loader.single_dep import loader as base_loader
 
 # XXX: This logic should rely in kind.yml. This hasn't been done in the original
 # patch because it required some heavy changes in single_dep.
 LABELS_WHICH_SHOULD_SIGN_CI_BUILDS = (
     'build-win32/debug', 'build-win32/opt', 'build-win32/pgo',
     'build-win64/debug', 'build-win64/opt', 'build-win64/pgo',
+    'build-win32-devedition/opt', 'build-win64-devedition/opt',
 )
 
 
 def loader(kind, path, config, params, loaded_tasks):
     jobs = base_loader(kind, path, config, params, loaded_tasks)
 
     for job in jobs:
         dependent_task = job['dependent-task']
--- a/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
+++ b/taskcluster/taskgraph/transforms/gecko_v2_whitelist.py
@@ -73,27 +73,29 @@ JOB_NAME_WHITELIST = set([
     'sm-package-opt',
     'sm-plain-opt',
     'sm-plaindebug-debug',
     'sm-rootanalysis-debug',
     'sm-tsan-opt',
     'win32-add-on-devel',
     'win32-clang-tidy',
     'win32-debug',
+    'win32-devedition-opt',
     'win32-nightly-repackage',
     'win32-nightly-repackage-signing',
     'win32-noopt-debug',
     'win32-opt',
     'win32-pgo',
     'win32-st-an-debug',
     'win32-st-an-opt',
     'win32-dmd-opt',
     'win64-add-on-devel',
     'win64-clang-tidy',
     'win64-debug',
+    'win64-devedition-opt',
     'win64-nightly-repackage',
     'win64-nightly-repackage-signing',
     'win64-noopt-debug',
     'win64-opt',
     'win64-pgo',
     'win64-st-an-debug',
     'win64-st-an-opt',
     'win64-asan-debug',
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -33,20 +33,23 @@ BUILDER_NAME_PREFIX = {
     'android-4.3-arm7-api-15': 'Android 4.3 armv7 API 15+',
     'android-4.2-x86': 'Android 4.2 x86 Emulator',
     'android-4.3-arm7-api-15-gradle': 'Android 4.3 armv7 API 15+',
     'windows10-64': 'Windows 10 64-bit',
     'windows10-64-nightly': 'Windows 10 64-bit',
     'windows10-64-pgo': 'Windows 10 64-bit',
     'windows10-64-asan': 'Windows 10 64-bit',
     'windows7-32': 'Windows 7 32-bit',
+    ('windows7-32', 'virtual-with-gpu'): 'Windows 7 VM-GFX 32-bit',
     'windows7-32-nightly': 'Windows 7 32-bit',
+    'windows7-32-devedition': 'Windows 7 32-bit DevEdition',
     'windows7-32-pgo': 'Windows 7 32-bit',
     'windows8-64': 'Windows 8 64-bit',
     'windows8-64-nightly': 'Windows 8 64-bit',
+    'windows8-64-devedition': 'Windows 8 64-bit DevEdition',
     'windows8-64-pgo': 'Windows 8 64-bit',
 }
 
 VARIANTS = [
     'nightly',
     'devedition',
     'pgo',
     'asan',
@@ -482,21 +485,29 @@ def mozharness_test_buildbot_bridge(conf
             variant=variant,
             branch=branch,
             test_name=test_name
         )
 
         if buildername.startswith('Ubuntu'):
             buildername = buildername.replace('VM', 'HW')
     else:
-        buildername = '{} {} {} test {}'.format(
-            BUILDER_NAME_PREFIX[test_platform],
-            branch,
-            build_type,
-            test_name
+        variant = get_variant(test['test-platform'])
+        # If we are a pgo type, munge the build_type for the
+        # Unittest builder name generation
+        if 'pgo' in variant:
+            build_type = variant
+        prefix = BUILDER_NAME_PREFIX.get(
+            (test_platform, test.get('virtualization')),
+            BUILDER_NAME_PREFIX[test_platform])
+        buildername = '{prefix} {branch} {build_type} test {test_name}'.format(
+            prefix=prefix,
+            branch=branch,
+            build_type=build_type,
+            test_name=test_name
         )
 
     worker.update({
         'buildername': buildername,
         'sourcestamp': {
             'branch': branch,
             'repository': config.params['head_repository'],
             'revision': config.params['head_rev'],
--- a/taskcluster/taskgraph/transforms/signing.py
+++ b/taskcluster/taskgraph/transforms/signing.py
@@ -91,19 +91,17 @@ def make_task_description(config, jobs):
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
         build_type = dep_job.attributes.get('build_type')
         build_platform = dep_job.attributes.get('build_platform')
         treeherder.setdefault('platform', _generate_treeherder_platform(
             dep_th_platform, build_platform, build_type
         ))
 
-        # TODO: Make non-nightly (i.e. windows CI builds) Tier 1 once green on
-        # central, inbound, autoland and try
-        treeherder.setdefault('tier', 1 if is_nightly else 3)
+        treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
 
         label = job.get('label', "{}-signing".format(dep_job.label))
 
         attributes = copy_attributes_from_dependent_job(dep_job)
         attributes['signed'] = True
 
         if dep_job.attributes.get('chunk_locales'):
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -56,26 +56,36 @@ WINDOWS_WORKER_TYPES = {
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
       'hardware': 'releng-hardware/gecko-t-win7-32-hw',
     },
     'windows7-32-nightly': {
       'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
       'hardware': 'releng-hardware/gecko-t-win7-32-hw',
     },
+    'windows7-32-devedition': {
+      'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
+      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
+      'hardware': 'releng-hardware/gecko-t-win7-32-hw',
+    },
     'windows10-64': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
     'windows10-64-pgo': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
+    'windows10-64-devedition': {
+      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
+      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
+      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+    },
     'windows10-64-nightly': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
     'windows10-64-asan': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
@@ -498,17 +508,25 @@ def set_tier(config, tests):
                                          'linux32-devedition/opt',
                                          'linux64/opt',
                                          'linux64-nightly/opt',
                                          'linux64/debug',
                                          'linux64-pgo/opt',
                                          'linux64-devedition/opt',
                                          'linux64-asan/opt',
                                          'windows7-32/debug',
-                                         'windows7-32-vm/debug',
+                                         'windows7-32/opt',
+                                         'windows7-32-pgo/opt',
+                                         'windows7-32-devedition/opt',
+                                         'windows7-32-nightly/opt',
+                                         'windows10-64/debug',
+                                         'windows10-64/opt',
+                                         'windows10-64-pgo/opt',
+                                         'windows10-64-devedition/opt',
+                                         'windows10-64-nightly/opt',
                                          'macosx64/opt',
                                          'macosx64/debug',
                                          'android-4.3-arm7-api-15/opt',
                                          'android-4.3-arm7-api-15/debug',
                                          'android-4.2-x86/opt']:
                 test['tier'] = 1
             else:
                 test['tier'] = 2
@@ -804,16 +822,28 @@ def set_worker_type(config, tests):
                 test['worker-type'] = LINUX_WORKER_TYPES[test['instance-size']]
         else:
             raise Exception("unknown test_platform {}".format(test_platform))
 
         yield test
 
 
 @transforms.add
+def skip_win10_hardware(config, tests):
+    """Windows 10 hardware isn't ready yet, don't even bother scheduling
+    unless we're on try"""
+    for test in tests:
+        if 'releng-hardware/gecko-t-win10-64-hw' not in test['worker-type']:
+            yield test
+        if config.params == 'try':
+            yield test
+        # Silently drop the test on the floor if its win10 hardware and we're not try
+
+
+@transforms.add
 def make_job_description(config, tests):
     """Convert *test* descriptions to *job* descriptions (input to
     taskgraph.transforms.job)"""
 
     for test in tests:
         label = '{}-{}-{}'.format(config.kind, test['test-platform'], test['test-name'])
         if test['chunks'] > 1:
             label += '-{}'.format(test['this-chunk'])
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@@ -35,18 +35,18 @@ config = {
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
     'vcs_share_base': 'C:/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': [sys.executable,
                         'C:/mozilla-build/tooltool.py'],
     'tooltool_bootstrap': "setup.sh",
     'enable_count_ctors': False,
-    'enable_talos_sendchange': True,
-    'enable_unittest_sendchange': True,
+    'enable_talos_sendchange': False,
+    'enable_unittest_sendchange': False,
     'max_build_output_timeout': 60 * 80,
     #########################################################################
 
 
      #########################################################################
      ###### 32 bit specific ######
     'base_name': 'WINNT_5.2_%(branch)s',
     'platform': 'win32',
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@@ -35,18 +35,18 @@ config = {
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
     'vcs_share_base': 'C:/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': [sys.executable,
                         'C:/mozilla-build/tooltool.py'],
     'tooltool_bootstrap': "setup.sh",
     'enable_count_ctors': False,
-    'enable_talos_sendchange': True,
-    'enable_unittest_sendchange': True,
+    'enable_talos_sendchange': False,
+    'enable_unittest_sendchange': False,
     'max_build_output_timeout': 60 * 80,
     #########################################################################
 
 
      #########################################################################
      ###### 64 bit specific ######
     'base_name': 'WINNT_6.1_x86-64_%(branch)s',
     'platform': 'win64',