Bug 1381577 - Support mozharness actions on windows generic worker r=dustin draft
authorJustin Wood <Callek@gmail.com>
Wed, 28 Jun 2017 20:31:21 -0700
changeset 611716 00c9482cd5df898a57ffc72b2822b6c6fcb0fc93
parent 611715 4978124e20111a88cc5960c85b805e128729f4c9
child 611717 d161bf70158b648954d4906872ec3fb206cb9505
push id69287
push userCallek@gmail.com
push dateThu, 20 Jul 2017 01:11:37 +0000
reviewersdustin
bugs1381577
milestone56.0a1
Bug 1381577 - Support mozharness actions on windows generic worker r=dustin Land date changes to support windows nightlies onto central MozReview-Commit-ID: LEllTfFjvKZ
taskcluster/taskgraph/transforms/job/mozharness.py
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -180,19 +180,18 @@ def mozharness_on_docker_worker_setup(co
 @run_job_using("generic-worker", "mozharness", schema=mozharness_run_schema)
 def mozharness_on_generic_worker(config, job, taskdesc):
     assert job['worker']['os'] == 'windows', 'only supports windows right now'
 
     run = job['run']
 
     # fail if invalid run options are included
     invalid = []
-    for prop in ['actions',
-                 'tooltool-downloads', 'secrets', 'taskcluster-proxy',
-                 'need-xvfb']:
+    for prop in ['tooltool-downloads',
+                 'secrets', 'taskcluster-proxy', 'need-xvfb']:
         if prop in run and run[prop]:
             invalid.append(prop)
     if not run.get('keep-artifacts', True):
         invalid.append('keep-artifacts')
     if invalid:
         raise Exception("Jobs run using mozharness on Windows do not support properties " +
                         ', '.join(invalid))
 
@@ -219,16 +218,19 @@ def mozharness_on_generic_worker(config,
         )
 
     mh_command = [r'c:\mozilla-build\python\python.exe']
     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')
+    for action in run.get('actions', []):
+        mh_command.append('--' + action)
+
     for option in run.get('options', []):
         mh_command.append('--' + option)
     if run.get('custom-build-variant-cfg'):
         mh_command.append('--custom-build-variant')
         mh_command.append(run['custom-build-variant-cfg'])
 
     hg_command = ['"c:\\Program Files\\Mercurial\\hg.exe"']
     hg_command.append('robustcheckout')