Bug 1381577 - Part D; Add support for not passing --branch and --skip-buildbot-actions to mozharness tasks on windows workers. r=dustin

Land date changes to support windows nightlies onto central

MozReview-Commit-ID: BWngsoOaNzg

--HG--
extra : rebase_source : 0960c34d734a229a77fea2cffa331c69d68f00b6

taskcluster/taskgraph/transforms/job/mozharness.py

@@ -85,7 +85,12 @@ mozharness_run_schema = Schema({
     Required('requires-signed-builds', default=False): bool,
 
     # If false, don't set MOZ_SIMPLE_PACKAGE_NAME
+    # Only disableable on windows
     Required('use-simple-package', default=True): bool,
+
+    # If false don't pass --branch or --skip-buildbot-actions to mozharness script
+    # Only disableable on windows
+    Required('use-magic-mh-args', default=True): bool,
 })
 
 
@@ -99,6 +104,9 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
     if not run['use-simple-package']:
         raise NotImplementedError("Simple packaging cannot be disabled via"
                                   "'use-simple-package' on docker-workers")
+    if not run['use-magic-mh-args']:
+        raise NotImplementedError("Cannot disabled mh magic arg passing via"
+                                  "'use-magic-mh-args' on docker-workers")
 
     # running via mozharness assumes desktop-build (which contains build.sh)
     taskdesc['worker']['docker-image'] = {"in-tree": "desktop-build"}
@@ -229,8 +237,10 @@ def mozharness_on_generic_worker(config, job, taskdesc):
     mh_command.append('\\'.join([r'.\build\src\testing', run['script'].replace('/', '\\')]))
     for cfg in run['config']:
         mh_command.append('--config ' + cfg.replace('/', '\\'))
-    mh_command.append('--branch ' + config.params['project'])
-    mh_command.append(r'--skip-buildbot-actions --work-dir %cd:Z:=z:%\build')
+    if run['use-magic-mh-args']:
+        mh_command.append('--branch ' + config.params['project'])
+        mh_command.append(r'--skip-buildbot-actions')
+    mh_command.append(r'--work-dir %cd:Z:=z:%\build')
     for action in run.get('actions', []):
         mh_command.append('--' + action)