Bug 1527777 - Move spidermonkey jobs from win32 to win64 r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D20619

--HG--
extra : moz-landing-system : lando

taskcluster/ci/spidermonkey/windows.yml

@@ -7,36 +7,88 @@ job-defaults:
     worker:
         max-run-time: 36000
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
+
+sm-plain-win64/debug:
+    description: "Spidermonkey Plain win64 debug"
+    index:
+        job-name: sm-plain-win64-debug
+    treeherder:
+        platform: windows2012-64/debug
+        symbol: SM(p)
+    run:
+        spidermonkey-variant: plaindebug
+        spidermonkey-platform: win64
+    toolchains:
+        - win64-clang-cl
+        - win64-rust
 
 sm-plain-win32/debug:
-    description: "Spidermonkey Plain"
+    description: "Spidermonkey Plain win32 debug"
     index:
         job-name: sm-plain-win32-debug
     treeherder:
         platform: windows2012-32/debug
         symbol: SM(p)
+    run-on-projects: []
     run:
         spidermonkey-variant: plaindebug
+        spidermonkey-platform: win32
+    toolchains:
+        - win64-clang-cl
+        - win64-rust
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
+
+sm-plain-win64/opt:
+    description: "Spidermonkey Plain win64 opt"
+    index:
+        job-name: sm-plain-win64-opt
+    treeherder:
+        platform: windows2012-64/opt
+        symbol: SM(p)
+    run:
+        spidermonkey-variant: plain
+        spidermonkey-platform: win64
     toolchains:
         - win64-clang-cl
         - win64-rust
 
 sm-plain-win32/opt:
-    description: "Spidermonkey Plain"
+    description: "Spidermonkey Plain win32 opt"
     index:
         job-name: sm-plain-win32-opt
     treeherder:
         platform: windows2012-32/opt
         symbol: SM(p)
+    run-on-projects: []
     run:
         spidermonkey-variant: plain
+        spidermonkey-platform: win32
+    toolchains:
+        - win64-clang-cl
+        - win64-rust
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
+
+sm-compacting-win64/debug:
+    description: "Spidermonkey Compacting win64 debug"
+    index:
+        job-name: sm-compacting-win64-debug
+    treeherder:
+        platform: windows2012-64/debug
+        symbol: SM(cgc)
+    run:
+        spidermonkey-variant: compacting
+        spidermonkey-platform: win64
     toolchains:
         - win64-clang-cl
         - win64-rust
 
 sm-compacting-win32/debug:
-    description: "Spidermonkey Compacting"
+    description: "Spidermonkey Compacting win32 debug"
     index:
         job-name: sm-compacting-win32-debug
     treeherder:
@@ -44,6 +96,11 @@ sm-compacting-win32/debug:
         symbol: SM(cgc)
     run:
         spidermonkey-variant: compacting
+        spidermonkey-platform: win32
+    run-on-projects: []
     toolchains:
         - win64-clang-cl
         - win64-rust
+    worker:
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"

taskcluster/scripts/builder/build-sm.sh

@@ -8,7 +8,7 @@ source $(dirname $0)/sm-tooltool-config.sh
 
 # Run the script
 export MOZ_UPLOAD_DIR="$UPLOAD_DIR"
-AUTOMATION=1 $PYTHON $SRCDIR/js/src/devtools/automation/autospider.py $SPIDERMONKEY_VARIANT
+AUTOMATION=1 $PYTHON $SRCDIR/js/src/devtools/automation/autospider.py ${SPIDERMONKEY_PLATFORM:+--platform=$SPIDERMONKEY_PLATFORM} $SPIDERMONKEY_VARIANT
 BUILD_STATUS=$?
 
 # Ensure upload dir exists

taskcluster/taskgraph/transforms/job/spidermonkey.py

@@ -8,7 +8,7 @@ Support for running spidermonkey jobs via dedicated scripts
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.util.schema import Schema
-from voluptuous import Required, Any
+from voluptuous import Required, Any, Optional
 
 from taskgraph.transforms.job import run_job_using
 from taskgraph.transforms.job.common import (
@@ -23,8 +23,9 @@ sm_run_schema = Schema({
     Required('using'): Any('spidermonkey', 'spidermonkey-package', 'spidermonkey-mozjs-crate',
                            'spidermonkey-rust-bindings'),
 
-    # The SPIDERMONKEY_VARIANT
+    # SPIDERMONKEY_VARIANT and SPIDERMONKEY_PLATFORM
     Required('spidermonkey-variant'): basestring,
+    Optional('spidermonkey-platform'): basestring,
 
     # Base work directory used to set up the task.
     Required('workdir'): basestring,
@@ -59,6 +60,8 @@ def docker_worker_spidermonkey(config, job, taskdesc):
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],
     })
+    if 'spidermonkey-platform' in run:
+        env['SPIDERMONKEY_PLATFORM'] = run['spidermonkey-platform']
 
     support_vcs_checkout(config, job, taskdesc)