Bug 1381577 - Add support for not passing MOZ_SIMPLE_PACKAGE_NAME to windows workers. r=dustin draft
authorJustin Wood <Callek@gmail.com>
Mon, 17 Jul 2017 15:25:19 -0400
changeset 611718 f9ab9c4ea098adfdbd2100565f6ef2974c53a3a2
parent 611717 d161bf70158b648954d4906872ec3fb206cb9505
child 611719 94c796c743e800f2464cd8d65d0f0b9422391f05
push id69287
push userCallek@gmail.com
push dateThu, 20 Jul 2017 01:11:37 +0000
reviewersdustin
bugs1381577
milestone56.0a1
Bug 1381577 - Add support for not passing MOZ_SIMPLE_PACKAGE_NAME to windows workers. r=dustin Land date changes to support windows nightlies onto central MozReview-Commit-ID: JOg3Y3cYmj8
taskcluster/taskgraph/transforms/job/mozharness.py
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -203,19 +203,20 @@ def mozharness_on_generic_worker(config,
     }]
 
     docker_worker_add_gecko_vcs_env_vars(config, job, taskdesc)
 
     env = worker['env']
     env.update({
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],
-        'MOZ_SIMPLE_PACKAGE_NAME': 'target',
         'MOZ_AUTOMATION': '1',
     })
+    if not env.get('DISABLE_SIMPLE_PACKAGE', False):
+        env.update({'MOZ_SIMPLE_PACKAGE_NAME': 'target'})
 
     if not job['attributes']['build_platform'].startswith('win'):
         raise Exception(
             "Task generation for mozharness build jobs currently only supported on Windows"
         )
 
     mh_command = [r'c:\mozilla-build\python\python.exe']
     mh_command.append('\\'.join([r'.\build\src\testing', run['script'].replace('/', '\\')]))