Bug 1496059 - Turn off tests for Windows MSVC builds. r=froydnj,ahal,jmaher
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 12 Oct 2018 17:44:51 +0000
changeset 499362 1ade03649066860b07165fe788f28f48a0d24a38
parent 499361 f464ecbaeeda2c62e78f5a3b862597f737601f8a
child 499363 40af17ba0d2cfda60b2b4e110c025a06618dc316
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj, ahal, jmaher
bugs1496059
milestone64.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 1496059 - Turn off tests for Windows MSVC builds. r=froydnj,ahal,jmaher Also removes the signing jobs since they're not needed anymore. Differential Revision: https://phabricator.services.mozilla.com/D8455
taskcluster/ci/test/misc.yml
taskcluster/ci/test/talos.yml
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/web-platform.yml
taskcluster/taskgraph/loader/build_signing.py
taskcluster/taskgraph/transforms/signing.py
taskcluster/taskgraph/transforms/tests.py
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -84,17 +84,16 @@ test-verify:
     max-run-time: 10800
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
             # do not run on beta or release: usually just confirms earlier results
-            .*-msvc/.*: ['mozilla-central', 'try']
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         script:
             by-test-platform:
                 android-em.*: android_emulator_unittest.py
                 default: desktop_unittest.py
         config:
@@ -128,17 +127,16 @@ test-verify-gpu:
     max-run-time: 10800
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
             # do not run on beta or release: usually just confirms earlier results
-            .*-msvc/.*: ['mozilla-central', 'try']
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         script:
             by-test-platform:
                 android-em.*: android_emulator_unittest.py
                 default: desktop_unittest.py
         config:
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -27,17 +27,16 @@ job-defaults:
 
 talos-bcv:
     description: "Talos basic compositor video"
     try-name: bcv
     treeherder-symbol: T(bcv)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: []  # this test is not useful with webrender
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
             default: ['mozilla-beta', 'trunk', 'try']
     tier:
         by-test-platform:
             .*-qr/.*: 3  # this should be disabled but might run via try syntax anyway, so explicitly downgrade to tier-3
             default: default
     max-run-time: 1800
     mozharness:
         extra-options:
@@ -45,558 +44,452 @@ talos-bcv:
 
 talos-bcv-profiling:
     description: "Talos profiling basic compositor video"
     try-name: bcv-profiling
     treeherder-symbol: T-P(bcv)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: []  # this test is not useful with webrender
-            windows.*msvc/.*: ['mozilla-central', 'try']
             default: ['mozilla-central', 'try']
     tier:
         by-test-platform:
             .*-qr/.*: 3  # this should be disabled but might run via try syntax anyway, so explicitly downgrade to tier-3
             default: default
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=bcv
             - --geckoProfile
 
 talos-chrome:
     description: "Talos chrome"
     try-name: chromez
     treeherder-symbol: T(c)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=chromez
 
 talos-chrome-profiling:
     description: "Talos profiling chrome"
     try-name: chromez-profiling
     treeherder-symbol: T-P(c)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=chromez
             - --geckoProfile
 
 talos-damp:
     description: "Talos devtools (damp)"
     try-name: damp
     treeherder-symbol: T(damp)
     max-run-time: 5400
     run-on-projects:
         by-test-platform:
             linux64-ccov/.*: ['try']  # Bug 1407593
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
             default: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=damp
 
 talos-damp-profiling:
     description: "Talos profiling devtools"
     try-name: damp-profiling
     treeherder-symbol: T-P(damp)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=damp
             - --geckoProfile
 
 talos-dromaeojs:
     description: "Talos dromaeojs"
     try-name: dromaeojs
     treeherder-symbol: T(d)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 2100
     mozharness:
         extra-options:
             - --suite=dromaeojs
 
 talos-dromaeojs-profiling:
     description: "Talos profiling dromaeojs"
     try-name: dromaeojs-profiling
     treeherder-symbol: T-P(d)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 2100
     mozharness:
         extra-options:
             - --suite=dromaeojs
             - --geckoProfile
 
 talos-flex:
     description: "Talos XUL flexbox emulation enabled"
     try-name: flex
     treeherder-symbol: T(f)
     tier: 3
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=flex
 
 talos-g1:
     description: "Talos g1"
     try-name: g1
     treeherder-symbol: T(g1)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 3600
             default: 7200
     mozharness:
         extra-options:
             - --suite=g1
 
 talos-g1-profiling:
     description: "Talos profiling g1"
     try-name: g1-profiling
     treeherder-symbol: T-P(g1)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 3600
             default: 7200
     mozharness:
         extra-options:
             - --suite=g1
             - --geckoProfile
 
 talos-g3:
     description: "Talos g3"
     try-name: g3
     treeherder-symbol: T(g3)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 900
     mozharness:
         extra-options:
             - --suite=g3
 
 talos-g3-profiling:
     description: "Talos profiling g3"
     try-name: g3-profiling
     treeherder-symbol: T-P(g3)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 900
     mozharness:
         extra-options:
             - --suite=g3
             - --geckoProfile
 
 talos-g4:
     description: "Talos g4"
     try-name: g4
     treeherder-symbol: T(g4)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 1500
             default: 1800
     mozharness:
         extra-options:
             - --suite=g4
 
 talos-g4-profiling:
     description: "Talos profiling g4"
     try-name: g4-profiling
     treeherder-symbol: T-P(g4)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=g4
             - --geckoProfile
     max-run-time:
         by-test-platform:
             linux64.*: 1500
             default: 1800
 
 talos-g5:
     description: "Talos g5"
     try-name: g5
     treeherder-symbol: T(g5)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=g5
     max-run-time:
         by-test-platform:
             linux64.*: 1200
             default: 1800
 
 talos-g5-profiling:
     description: "Talos profiling g5"
     try-name: g5-profiling
     treeherder-symbol: T-P(g5)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=g5
             - --geckoProfile
     max-run-time:
         by-test-platform:
             linux64.*: 1200
             default: 1800
 
 talos-h1:
     description: "Talos h1"
     try-name: h1
     treeherder-symbol: T(h1)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=h1
     max-run-time:
         by-test-platform:
             linux64.*: 900
             default: 1800
 
 talos-h2:
     description: "Talos h2"
     try-name: h2
     treeherder-symbol: T(h2)
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time:
         by-test-platform:
             linux64.*: 900
             default: 7200
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=h2
 
 talos-motionmark:
     description: "Talos motionmark"
     try-name: motionmark
     treeherder-symbol: T(mm)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     tier:
         by-test-platform:
             windows10-64-ccov/.*: 3
             linux64-ccov/.*: 3
             default: 2
     mozharness:
         extra-options:
             - --suite=motionmark
 
 talos-motionmark-profiling:
     description: "Talos profiling motionmark"
     try-name: motionmark-profiling
     treeherder-symbol: T-P(mm)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 3600
     tier:
         by-test-platform:
             windows10-64-ccov/.*: 3
             linux64-ccov/.*: 3
             default: 2
     mozharness:
         extra-options:
             - --suite=motionmark
             - --geckoProfile
 
 talos-other:
     description: "Talos other"
     try-name: other
     treeherder-symbol: T(o)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=other
 
 talos-sessionrestore-many-windows:
     description: "Talos sessionrestore-many-windows"
     try-name: sessionrestore-many-windows
     treeherder-symbol: T(smw)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=sessionrestore-many-windows
 
 talos-other-profiling:
     description: "Talos profiling other"
     try-name: other-profiling
     treeherder-symbol: T-P(o)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=other
             - --geckoProfile
 
 talos-perf-reftest:
     description: "Talos perf-reftest"
     try-name: perf-reftest
     treeherder-symbol: T(p)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['trunk', 'try']
+    run-on-projects: ['trunk', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=perf-reftest
 
 talos-perf-reftest-profiling:
     description: "Talos profiling perf-reftest"
     try-name: perf-reftest-profiling
     treeherder-symbol: T-P(p)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=perf-reftest
             - --geckoProfile
 
 talos-perf-reftest-singletons:
     description: "Talos perf-reftest singletons"
     try-name: perf-reftest-singletons
     treeherder-symbol: T(ps)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['trunk', 'try']
+    run-on-projects: ['trunk', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=perf-reftest-singletons
 
 talos-perf-reftest-singletons-profiling:
     description: "Talos profiling perf-reftest singletons"
     try-name: perf-reftest-singletons-profiling
     treeherder-symbol: T-P(ps)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=perf-reftest-singletons
             - --geckoProfile
 
 talos-speedometer:
     description: "Talos speedometer"
     try-name: speedometer
     treeherder-symbol: T(sp)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=speedometer
 
 talos-speedometer-profiling:
     description: "Talos profiling speedometer"
     try-name: speedometer-profiling
     treeherder-symbol: T-P(sp)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1500
     mozharness:
         extra-options:
             - --suite=speedometer
             - --geckoProfile
 
 talos-svgr:
     description: "Talos svgr"
     try-name: svgr
     treeherder-symbol: T(s)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=svgr
 
 talos-svgr-profiling:
     description: "Talos profiling svgr"
     try-name: svgr-profiling
     treeherder-symbol: T-P(s)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=svgr
             - --geckoProfile
 
 talos-tp5o:
     description: "Talos tp5o"
     try-name: tp5o
     treeherder-symbol: T(tp)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=tp5o
 
 talos-tp5o-profiling:
     description: "Talos profiling tp5o"
     try-name: tp5o-profiling
     treeherder-symbol: T-P(tp)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=tp5o
             - --geckoProfile
 
 talos-tp6:
     description: "Talos tp6"
     try-name: tp6
     treeherder-symbol: T(tp6)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
-            default: ['mozilla-beta', 'trunk', 'try']
+    run-on-projects: ['mozilla-beta', 'trunk', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=tp6
 
 talos-tp6-profiling:
     description: "Talos profiling tp6"
     try-name: tp6-profiling
     treeherder-symbol: T-P(tp6)
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1200
     mozharness:
         extra-options:
             - --suite=tp6
             - --geckoProfile
 
 talos-tp6-stylo-threads:
     description: "Talos Stylo sequential tp6"
     try-name: tp6-stylo-threads
     treeherder-symbol: Tss(tp6)
     max-run-time: 1200
     run-on-projects:
         by-test-platform:
             macosx.*: ['mozilla-beta', 'autoland', 'try']
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
             default: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=tp6-stylo-threads
 
 talos-tps:
     description: "Talos page scroll (tps)"
     try-name: tps
     treeherder-symbol: T(tps)
     max-run-time: 900
     run-on-projects:
         by-test-platform:
             linux64-ccov/.*: ['try']  # Bug 1407593
-            windows.*msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
             default: ['mozilla-beta', 'trunk', 'try']
     mozharness:
         extra-options:
             - --suite=tps
 
 talos-tps-profiling:
     description: "Talos page scroll profiling (tps)"
     try-name: tps-profiling
     treeherder-symbol: T-P(tps)
     max-run-time: 900
-    run-on-projects:
-        by-test-platform:
-            windows.*msvc/.*: ['mozilla-central', 'try']
-            default: ['mozilla-central', 'try']
+    run-on-projects: ['mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=tps
             - --geckoProfile
 
 talos-xperf:
     description: "Talos xperf"
     try-name: xperf
@@ -604,17 +497,16 @@ talos-xperf:
     virtualization: virtual
     os-groups: ['Administrators']
     run-as-administrator:
         by-test-platform:
             windows7-32.*: false
             windows10-64.*: true
     run-on-projects:
         by-test-platform:
-            windows7-32-msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']
             windows7-32(-pgo)?/.*: ['mozilla-beta', 'trunk', 'try']
             windows10-64.*/opt: ['mozilla-beta', 'trunk', 'try']
             default: []
     tier:
         by-test-platform:
             windows7-32.*: default
             windows10-64(-pgo)?/.*: default
             windows10-64-ccov/debug: 3
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -125,22 +125,16 @@ linux64-ccov/debug:
 
 # win32
 windows7-32/debug:
     build-platform: win32/debug
     test-sets:
         - windows-reftest-gpu
         - windows-tests
 
-windows7-32-msvc/debug:
-    build-platform: win32-msvc/debug
-    test-sets:
-        - windows-reftest-gpu
-        - windows-tests
-
 windows7-32/opt:
     build-platform: win32/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-talos
         - windows-tests
@@ -167,25 +161,16 @@ windows7-32-nightly/opt:
 
 windows7-32-devedition/opt:
     build-platform: win32-devedition-nightly/opt
     test-sets:
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-tests
 
-windows7-32-msvc/opt:
-    build-platform: win32-msvc/opt
-    test-sets:
-        - awsy
-        - desktop-screenshot-capture
-        - windows-reftest-gpu
-        - windows-talos
-        - windows-tests
-
 # win64
 windows10-64-ccov/debug:
     build-platform: win64-ccov/debug
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-talos
@@ -193,22 +178,16 @@ windows10-64-ccov/debug:
         - ccov-code-coverage-tests
 
 windows10-64/debug:
     build-platform: win64/debug
     test-sets:
         - windows-tests
         - mochitest-headless
 
-windows10-64-msvc/debug:
-    build-platform: win64-msvc/debug
-    test-sets:
-        - windows-tests
-        - mochitest-headless
-
 windows10-64/opt:
     build-platform: win64/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-talos
         - windows-tests
         - mochitest-headless
@@ -239,25 +218,16 @@ windows10-64-devedition/opt:
         - desktop-screenshot-capture
         - windows-tests
 
 windows10-64-asan/opt:
     build-platform: win64-asan/opt
     test-sets:
         - common-tests
 
-windows10-64-msvc/opt:
-    build-platform: win64-msvc/opt
-    test-sets:
-        - awsy
-        - desktop-screenshot-capture
-        - windows-talos
-        - windows-tests
-        - mochitest-headless
-
 # QR builds just run a subset right now.
 windows10-64-qr/debug:
     build-platform: win64/debug
     test-sets:
         - windows-qr-tests
 
 windows10-64-qr/opt:
     build-platform: win64/opt
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -180,17 +180,16 @@ test-verify-wpt:
     treeherder-symbol: TVw
     max-run-time: 10800
     run-on-projects:
         by-test-platform:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
             # do not run on beta or release: usually just confirms earlier results
-            .*-msvc/.*: ['mozilla-central', 'try']
             default: ['trunk', 'try']
     tier: 2
     mozharness:
         extra-options:
             - --verify
 
 test-coverage-wpt:
     description: "Per web-platform test coverage"
--- a/taskcluster/taskgraph/loader/build_signing.py
+++ b/taskcluster/taskgraph/loader/build_signing.py
@@ -5,19 +5,17 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 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.
 NON_NIGHTLY_LABELS_WHICH_SHOULD_SIGN_BUILDS = (
     'build-win32/debug', 'build-win32/opt', 'build-win32/pgo',
-    'build-win32-msvc/debug', 'build-win32-msvc/opt',
     'build-win64/debug', 'build-win64/opt', 'build-win64/pgo',
-    'build-win64-msvc/debug', 'build-win64-msvc/opt',
     'build-win32-devedition/opt', 'build-win64-devedition/opt',
     'build-win64-ccov/debug',
     'build-linux/opt', 'build-linux64/opt', 'build-macosx64/opt',
     'build-android-api-16/opt'
     'release-source-linux64-source/opt',
     'release-source-linux64-fennec-source/opt',
     'release-source-linux64-devedition-source/opt',
     'release-eme-free-repack-macosx64-nightly',
--- a/taskcluster/taskgraph/transforms/signing.py
+++ b/taskcluster/taskgraph/transforms/signing.py
@@ -181,12 +181,12 @@ def _generate_treeherder_platform(dep_th
     elif '-ccov' in build_platform:
         actual_build_type = 'ccov'
     else:
         actual_build_type = build_type
     return '{}/{}'.format(dep_th_platform, actual_build_type)
 
 
 def _generate_treeherder_symbol(is_nightly, build_platform):
-    symbol = 'Ns' if is_nightly else 'Bs'
-    if '-msvc' in build_platform:
-        symbol += '-msvc'
-    return symbol
+    if is_nightly:
+        return 'Ns'
+    else:
+        return 'Bs'
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -68,21 +68,16 @@ WINDOWS_WORKER_TYPES = {
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-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-win10-64-hw',
     },
-    'windows7-32-msvc': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-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-ccov': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
@@ -103,21 +98,16 @@ WINDOWS_WORKER_TYPES = {
       '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',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
-    'windows10-64-msvc': {
-      '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-qr': {
       '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',
     },
 }
 
 # os x worker types keyed by test-platform