Merge pull request mozilla-releng#352 from escapewindow/env-taskid

add TASK_ID to task env.

CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [23.1.0] - 2019-06-26
+### Added
+- Added `context.task_id`
+
+### Changed
+- We now set `env['TASK_ID']` when running the script.
+
 ## [23.0.10] - 2019-06-11
 ### Fixed
 - Fennec Beta cannot be shipped off mozilla-esr68

scriptworker/context.py

@@ -102,6 +102,12 @@ def credentials(self):
         if self._credentials:
             return dict(deepcopy(self._credentials))
 
+    @property
+    def task_id(self):
+        """string: The running task's taskId."""
+        if self.claim_task:
+            return self.claim_task['status']['taskId']
+
     @credentials.setter
     def credentials(self, creds):
         self._credentials = creds

scriptworker/task.py

@@ -530,7 +530,7 @@ def prepare_to_run_task(context, claim_task):
     """
     current_task_info = {}
     context.claim_task = claim_task
-    current_task_info['taskId'] = get_task_id(claim_task)
+    current_task_info['taskId'] = context.task_id
     current_task_info['runId'] = get_run_id(claim_task)
     log.info("Going to run taskId {taskId} runId {runId}!".format(
         **current_task_info
@@ -556,12 +556,15 @@ async def run_task(context, to_cancellable_process):
         int: exit code
 
     """
+    env = deepcopy(os.environ)
+    env['TASK_ID'] = context.task_id or 'None'
     kwargs = {  # pragma: no branch
         'stdout': PIPE,
         'stderr': PIPE,
         'stdin': None,
         'close_fds': True,
         'preexec_fn': lambda: os.setsid(),
+        'env': env,
     }
 
     subprocess = await asyncio.create_subprocess_exec(*context.config['task_script'], **kwargs)