Use uppercase for revision env variable.

Change-Id: Iee5652b3aa87ca128d5208b4456d758bd4a53647
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/51083
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
diff --git a/recipe_modules/os_utils/api.py b/recipe_modules/os_utils/api.py
index 212633b..87e5a9c 100644
--- a/recipe_modules/os_utils/api.py
+++ b/recipe_modules/os_utils/api.py
@@ -40,7 +40,7 @@
         '${FLUTTER_LOGS_DIR}': 'FLUTTER_LOGS_DIR',
         '${LUCI_WORKDIR}': 'LUCI_WORKDIR',
         '${LUCI_CLEANUP}': 'LUCI_CLEANUP',
-        '${REVISION}': 'revision',
+        '${REVISION}': 'REVISION',
     }
     result = []
     for part in command:
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index d84c569..598a4b5 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -493,7 +493,7 @@
             str(android_tmp.join('.android')),
         'LUCI_WORKDIR':
             str(self.m.path['start_dir']),
-        'LUCI_TMPDIR':
+        'LUCI_CLEANUP':
             str(self.m.path['cleanup']),
         'REVISION':
             self.m.buildbucket.gitiles_commit.id or ''
diff --git a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
index 5d582d8..4aee8d2 100644
--- a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
+++ b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
@@ -272,8 +272,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]",
@@ -371,8 +371,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -467,8 +467,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -523,8 +523,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -585,8 +585,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -676,8 +676,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -758,8 +758,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -829,8 +829,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -904,8 +904,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -962,8 +962,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1029,8 +1029,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1097,8 +1097,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1161,8 +1161,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1222,8 +1222,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1285,8 +1285,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1362,8 +1362,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1436,8 +1436,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1499,8 +1499,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1566,8 +1566,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1634,8 +1634,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1692,8 +1692,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1759,8 +1759,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1827,8 +1827,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1891,8 +1891,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1952,8 +1952,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2015,8 +2015,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2080,8 +2080,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2139,8 +2139,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2195,8 +2195,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2251,8 +2251,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2316,8 +2316,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2377,8 +2377,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2449,8 +2449,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2512,8 +2512,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2569,8 +2569,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "PATH": "RECIPE_REPO[depot_tools]:<PATH>",
@@ -2625,8 +2625,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2679,8 +2679,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2737,8 +2737,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2791,8 +2791,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2847,8 +2847,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2901,8 +2901,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -2963,8 +2963,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -3034,8 +3034,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -3100,8 +3100,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
@@ -3166,8 +3166,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "PUB_CACHE": "[START_DIR]/.pub-cache",
@@ -3232,8 +3232,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -3529,8 +3529,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -3585,8 +3585,8 @@
       "GIT_BRANCH": "main",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "1",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 43caa8e..0ad183f 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json
@@ -184,8 +184,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -280,8 +280,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -344,8 +344,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -426,8 +426,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -499,8 +499,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -561,8 +561,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -627,8 +627,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -677,8 +677,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -741,8 +741,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -800,8 +800,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -855,8 +855,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -907,8 +907,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -961,8 +961,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1029,8 +1029,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1094,8 +1094,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1148,8 +1148,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1206,8 +1206,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1260,8 +1260,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1323,8 +1323,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1375,8 +1375,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1437,8 +1437,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1482,8 +1482,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1543,8 +1543,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1609,8 +1609,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1673,8 +1673,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1738,8 +1738,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1803,8 +1803,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1868,8 +1868,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1933,8 +1933,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1998,8 +1998,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2063,8 +2063,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2129,8 +2129,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2190,8 +2190,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2241,8 +2241,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2294,8 +2294,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2350,8 +2350,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2411,8 +2411,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2470,8 +2470,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2528,8 +2528,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
@@ -2592,8 +2592,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2652,8 +2652,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2720,8 +2720,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2780,8 +2780,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2836,8 +2836,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2892,8 +2892,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2947,8 +2947,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3003,8 +3003,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3063,8 +3063,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3119,8 +3119,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3177,8 +3177,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3237,8 +3237,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3293,8 +3293,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3351,8 +3351,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3411,8 +3411,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3467,8 +3467,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3525,8 +3525,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
diff --git a/recipes/engine_v2/builder.expected/config_file.json b/recipes/engine_v2/builder.expected/config_file.json
index e96814e..1d91a4f 100644
--- a/recipes/engine_v2/builder.expected/config_file.json
+++ b/recipes/engine_v2/builder.expected/config_file.json
@@ -184,8 +184,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -280,8 +280,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter-failure.json b/recipes/engine_v2/builder.expected/dart-internal-flutter-failure.json
index 308b93c..319b028 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter-failure.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter-failure.json
@@ -234,8 +234,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -330,8 +330,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -407,8 +407,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -465,8 +465,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -528,8 +528,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -580,8 +580,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -642,8 +642,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -687,8 +687,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -748,8 +748,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -814,8 +814,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -878,8 +878,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -943,8 +943,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1008,8 +1008,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1073,8 +1073,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1138,8 +1138,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1203,8 +1203,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1268,8 +1268,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1334,8 +1334,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1395,8 +1395,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1446,8 +1446,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1499,8 +1499,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1555,8 +1555,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1616,8 +1616,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1675,8 +1675,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1733,8 +1733,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789",
@@ -1797,8 +1797,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1857,8 +1857,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1925,8 +1925,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1985,8 +1985,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2037,8 +2037,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2092,8 +2092,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2148,8 +2148,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2203,8 +2203,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2259,8 +2259,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2319,8 +2319,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2375,8 +2375,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2433,8 +2433,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2491,8 +2491,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2548,8 +2548,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2604,8 +2604,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2660,8 +2660,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2718,8 +2718,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2776,8 +2776,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2833,8 +2833,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2889,8 +2889,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2945,8 +2945,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3003,8 +3003,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3061,8 +3061,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3118,8 +3118,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3169,8 +3169,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3231,8 +3231,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3288,8 +3288,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3348,8 +3348,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3408,8 +3408,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3465,8 +3465,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3523,8 +3523,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3583,8 +3583,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3643,8 +3643,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3702,8 +3702,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3763,8 +3763,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3834,8 +3834,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3892,8 +3892,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
index 6f8330b..f34bf37 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
@@ -234,8 +234,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -330,8 +330,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -407,8 +407,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -465,8 +465,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -528,8 +528,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -580,8 +580,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -642,8 +642,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -687,8 +687,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -748,8 +748,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -814,8 +814,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -878,8 +878,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -943,8 +943,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1008,8 +1008,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1073,8 +1073,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1138,8 +1138,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1203,8 +1203,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1268,8 +1268,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1334,8 +1334,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1395,8 +1395,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1446,8 +1446,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1499,8 +1499,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1555,8 +1555,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1616,8 +1616,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1675,8 +1675,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1733,8 +1733,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789",
@@ -1797,8 +1797,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1857,8 +1857,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1925,8 +1925,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -1985,8 +1985,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2037,8 +2037,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2092,8 +2092,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2148,8 +2148,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2203,8 +2203,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2259,8 +2259,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2319,8 +2319,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2375,8 +2375,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2433,8 +2433,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2491,8 +2491,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2548,8 +2548,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2604,8 +2604,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2660,8 +2660,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2718,8 +2718,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2776,8 +2776,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2833,8 +2833,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2889,8 +2889,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -2945,8 +2945,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3003,8 +3003,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3061,8 +3061,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3118,8 +3118,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3169,8 +3169,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3228,8 +3228,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3285,8 +3285,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3345,8 +3345,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3405,8 +3405,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3462,8 +3462,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3520,8 +3520,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3580,8 +3580,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3640,8 +3640,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3699,8 +3699,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3760,8 +3760,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3824,8 +3824,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3882,8 +3882,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -3941,8 +3941,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4003,8 +4003,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4064,8 +4064,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4124,8 +4124,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4181,8 +4181,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4239,8 +4239,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4299,8 +4299,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4359,8 +4359,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4418,8 +4418,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4479,8 +4479,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4543,8 +4543,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4601,8 +4601,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4660,8 +4660,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4722,8 +4722,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4783,8 +4783,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4843,8 +4843,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4900,8 +4900,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -4958,8 +4958,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -5018,8 +5018,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -5078,8 +5078,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -5137,8 +5137,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -5198,8 +5198,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -5262,8 +5262,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -5320,8 +5320,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -5379,8 +5379,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
@@ -5441,8 +5441,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 3cf931e..6742eaf 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -223,8 +223,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -319,8 +319,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -698,8 +698,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -780,8 +780,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -853,8 +853,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -915,8 +915,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -981,8 +981,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1031,8 +1031,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1095,8 +1095,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1154,8 +1154,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1209,8 +1209,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1261,8 +1261,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1315,8 +1315,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1383,8 +1383,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1448,8 +1448,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1502,8 +1502,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1560,8 +1560,8 @@
       "GOMA_USE_LOCAL": "False",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1614,8 +1614,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1677,8 +1677,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1729,8 +1729,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1791,8 +1791,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -1836,8 +1836,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1897,8 +1897,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -1963,8 +1963,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2027,8 +2027,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2092,8 +2092,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2157,8 +2157,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2222,8 +2222,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2287,8 +2287,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2352,8 +2352,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2417,8 +2417,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2483,8 +2483,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -2544,8 +2544,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2595,8 +2595,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2648,8 +2648,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2704,8 +2704,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2765,8 +2765,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2824,8 +2824,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -2882,8 +2882,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
@@ -2946,8 +2946,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3006,8 +3006,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3074,8 +3074,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3134,8 +3134,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3190,8 +3190,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3246,8 +3246,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3301,8 +3301,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3357,8 +3357,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3410,8 +3410,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3465,8 +3465,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3520,8 +3520,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3594,8 +3594,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3669,8 +3669,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3739,8 +3739,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3797,8 +3797,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3857,8 +3857,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3927,8 +3927,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -3985,8 +3985,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4045,8 +4045,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4115,8 +4115,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4173,8 +4173,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4233,8 +4233,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4303,8 +4303,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4361,8 +4361,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4421,8 +4421,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4491,8 +4491,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4549,8 +4549,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4606,8 +4606,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4664,8 +4664,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "P12_SUFFIX_FILEPATH": "[CLEANUP]/flutter.p12",
@@ -4719,8 +4719,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4773,8 +4773,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4832,8 +4832,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4888,8 +4888,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -4946,8 +4946,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -5006,8 +5006,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -5062,8 +5062,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -5120,8 +5120,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -5180,8 +5180,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -5236,8 +5236,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
@@ -5294,8 +5294,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
diff --git a/recipes/engine_v2/cache.expected/basic.json b/recipes/engine_v2/cache.expected/basic.json
index 2463efd..5f8bc21 100644
--- a/recipes/engine_v2/cache.expected/basic.json
+++ b/recipes/engine_v2/cache.expected/basic.json
@@ -137,8 +137,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -220,8 +220,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
diff --git a/recipes/engine_v2/engine_v2.expected/basic_linux.json b/recipes/engine_v2/engine_v2.expected/basic_linux.json
index 6bb430b..7be8425 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_linux.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_linux.json
@@ -424,8 +424,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]",
@@ -525,8 +525,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -621,8 +621,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -734,8 +734,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -793,8 +793,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 2f027d8..ac13161 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -430,8 +430,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -526,8 +526,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -986,8 +986,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -1045,8 +1045,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
index 188571c..b865333 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -459,8 +459,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -555,8 +555,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -1039,8 +1039,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -1098,8 +1098,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index daa1c49..fee6b2d 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -803,8 +803,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]",
@@ -904,8 +904,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -1000,8 +1000,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -1460,8 +1460,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -1519,8 +1519,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "darwin",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
diff --git a/recipes/engine_v2/engine_v2.expected/config_from_file.json b/recipes/engine_v2/engine_v2.expected/config_from_file.json
index 5a1ef21..a14de8c 100644
--- a/recipes/engine_v2/engine_v2.expected/config_from_file.json
+++ b/recipes/engine_v2/engine_v2.expected/config_from_file.json
@@ -730,8 +730,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]",
@@ -831,8 +831,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -927,8 +927,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
diff --git a/recipes/engine_v2/tester_engine.expected/basic.json b/recipes/engine_v2/tester_engine.expected/basic.json
index 40a2551..213f37c 100644
--- a/recipes/engine_v2/tester_engine.expected/basic.json
+++ b/recipes/engine_v2/tester_engine.expected/basic.json
@@ -110,8 +110,8 @@
       "GIT_TRACE_PACKET": "[CLEANUP]/trace-packet",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -193,8 +193,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -238,8 +238,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -288,8 +288,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -347,8 +347,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -404,8 +404,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -457,8 +457,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -506,8 +506,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -564,8 +564,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -608,8 +608,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -657,8 +657,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -704,8 +704,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -752,8 +752,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -805,8 +805,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -853,8 +853,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -909,8 +909,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -956,8 +956,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -997,8 +997,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1038,8 +1038,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1079,8 +1079,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1120,8 +1120,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -1165,8 +1165,8 @@
       "GIT_BRANCH": "",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_betaFalse.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_betaFalse.json
index 850700f..1eb2bca 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_betaFalse.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_betaFalse.json
@@ -441,8 +441,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -490,8 +490,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -525,8 +525,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -555,8 +555,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RELEASE_CHANNEL": "beta",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta_force.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta_force.json
index 850700f..1eb2bca 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta_force.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3-4.5.pre_beta_force.json
@@ -441,8 +441,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -490,8 +490,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -525,8 +525,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -555,8 +555,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RELEASE_CHANNEL": "beta",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stableFalse.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stableFalse.json
index 61bb36c..2b82d61 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stableFalse.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stableFalse.json
@@ -441,8 +441,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -490,8 +490,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -525,8 +525,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -555,8 +555,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RELEASE_CHANNEL": "stable",
diff --git a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable_force.json b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable_force.json
index 61bb36c..2b82d61 100644
--- a/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable_force.json
+++ b/recipes/release/release_publish.expected/flutter-2.8-candidate.9_1.2.3_stable_force.json
@@ -441,8 +441,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -490,8 +490,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -525,8 +525,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "REVISION": ""
@@ -555,8 +555,8 @@
       "GIT_BRANCH": "flutter-2.8-candidate.9",
       "LUCI_BRANCH": "",
       "LUCI_CI": "True",
+      "LUCI_CLEANUP": "[CLEANUP]",
       "LUCI_PR": "",
-      "LUCI_TMPDIR": "[CLEANUP]",
       "LUCI_WORKDIR": "[START_DIR]",
       "OS": "linux",
       "RELEASE_CHANNEL": "stable",