From 129dcb1ada3ba7e01899f25cf49512d10c5286d0 Mon Sep 17 00:00:00 2001
From: Tom Prince <mozilla@hocat.ca>
Date: Thu, 1 Aug 2019 11:08:37 -0600
Subject: [PATCH] Bug 1570054: Don't set `MOZ_AUTOMATION` in individual
 transfomrs; r=glandium

This is set in all jobs in automation, so we don't need to set it in specifc
jobs.

Differential Revision: https://phabricator.services.mozilla.com/D40235
---
 taskcluster/taskgraph/transforms/job/mozharness.py      | 2 --
 taskcluster/taskgraph/transforms/job/mozharness_test.py | 3 ---
 taskcluster/taskgraph/transforms/job/toolchain.py       | 2 --
 3 files changed, 7 deletions(-)

diff --git a/taskcluster/taskgraph/transforms/job/mozharness.py b/taskcluster/taskgraph/transforms/job/mozharness.py
index 65e10447fa66..e6e3a8c67358 100644
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -174,7 +174,6 @@ def mozharness_on_docker_worker_setup(config, job, taskdesc):
         'MH_BUILD_POOL': 'taskcluster',
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],
-        'MOZ_AUTOMATION': '1',
         'PYTHONUNBUFFERED': '1',
     })
 
@@ -267,7 +266,6 @@ def mozharness_on_generic_worker(config, job, taskdesc):
     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': get_branch_rev(config),
         'MOZ_SOURCE_REPO': get_branch_repo(config),
diff --git a/taskcluster/taskgraph/transforms/job/mozharness_test.py b/taskcluster/taskgraph/transforms/job/mozharness_test.py
index 69bfb984e091..4f3727765a98 100644
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -111,7 +111,6 @@ def mozharness_test_on_docker(config, job, taskdesc):
         'NEED_WINDOW_MANAGER': 'true',
         'NEED_COMPIZ': 'true',
         'ENABLE_E10S': str(bool(test.get('e10s'))).lower(),
-        'MOZ_AUTOMATION': '1',
         'WORKING_DIR': '/builds/worker',
     })
 
@@ -288,7 +287,6 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
     worker['artifacts'] = artifacts
 
     env = worker.setdefault('env', {})
-    env['MOZ_AUTOMATION'] = '1'
     env['GECKO_HEAD_REPOSITORY'] = config.params['head_repository']
     env['GECKO_HEAD_REV'] = config.params['head_rev']
 
@@ -468,7 +466,6 @@ def mozharness_test_on_script_engine_autophone(config, job, taskdesc):
         "NO_FAIL_ON_TEST_ERRORS": '1',
         "MOZ_HIDE_RESULTS_TABLE": '1',
         "MOZ_NODE_PATH": "/usr/local/bin/node",
-        'MOZ_AUTOMATION': '1',
         'WORKING_DIR': '/builds/worker',
         'WORKSPACE': '/builds/worker/workspace',
         'TASKCLUSTER_WORKER_TYPE': job['worker-type'],
diff --git a/taskcluster/taskgraph/transforms/job/toolchain.py b/taskcluster/taskgraph/transforms/job/toolchain.py
index 8e18722406e0..1c56b4e7b5db 100644
--- a/taskcluster/taskgraph/transforms/job/toolchain.py
+++ b/taskcluster/taskgraph/transforms/job/toolchain.py
@@ -135,7 +135,6 @@ def docker_worker_toolchain(config, job, taskdesc):
     env.update({
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],
-        'MOZ_AUTOMATION': '1',
         'MOZ_FETCHES_DIR': workspace,
         'GECKO_PATH': gecko_path,
     })
@@ -207,7 +206,6 @@ def windows_toolchain(config, job, taskdesc):
     env.update({
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],
-        'MOZ_AUTOMATION': '1',
     })
 
     # Use `mach` to invoke python scripts so in-tree libraries are available.