bug 1442306 - set MOZ_SOURCE_CHANGESET and MH_BRANCH consistently in the environment for mozharness tasks. r?build draft
authorTed Mielczarek <ted@mielczarek.org>
Mon, 30 Apr 2018 16:26:59 -0400
changeset 790207 4833c3a67508a8ec6ea58b6989fec87d56035d50
parent 790206 fa5131dcb900e47ba51c09be7e59509898eb77d2
child 790208 52af1ed4e32fc617b8189fb2ebe9a4835610132f
push id108449
push userbmo:ted@mielczarek.org
push dateTue, 01 May 2018 17:51:29 +0000
reviewersbuild
bugs1442306
milestone61.0a1
bug 1442306 - set MOZ_SOURCE_CHANGESET and MH_BRANCH consistently in the environment for mozharness tasks. r?build We currently set GECKO_HEAD_REV to the revision being built, but the build system already looks for MOZ_SOURCE_CHANGESET so set that as well. Additionally, set MH_BRANCH for mozharness tasks on generic-worker to match docker-worker. MozReview-Commit-ID: 52B3SSQpSwU
taskcluster/taskgraph/transforms/job/mozharness.py
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -144,16 +144,17 @@ def mozharness_on_docker_worker_setup(co
                                       extra=run.get('extra-workspace-cache-key'))
     support_vcs_checkout(config, job, taskdesc)
 
     env = worker.setdefault('env', {})
     env.update({
         'MOZHARNESS_CONFIG': ' '.join(run['config']),
         'MOZHARNESS_SCRIPT': run['script'],
         'MH_BRANCH': config.params['project'],
+        'MOZ_SOURCE_CHANGESET': env['GECKO_HEAD_REV'],
         'MH_BUILD_POOL': 'taskcluster',
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],
         'MOZ_AUTOMATION': '1',
     })
 
     if 'actions' in run:
         env['MOZHARNESS_ACTIONS'] = ' '.join(run['actions'])
@@ -240,16 +241,18 @@ 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_AUTOMATION': '1',
+        'MH_BRANCH': config.params['project'],
+        'MOZ_SOURCE_CHANGESET': env['GECKO_HEAD_REV'],
     })
     if run['use-simple-package']:
         env.update({'MOZ_SIMPLE_PACKAGE_NAME': 'target'})
 
     if 'extra-config' in run:
         env['EXTRA_MOZHARNESS_CONFIG'] = json.dumps(run['extra-config'])
 
     # The windows generic worker uses batch files to pass environment variables