Merge remote branch 'origin/upstream' into tempbranch

frontend/planner/failure_actions.py

Index: frontend/planner/failure_actions.py
diff --git a/frontend/planner/failure_actions.py b/frontend/planner/failure_actions.py
new file mode 100644
index 0000000000000000000000000000000000000000..2dd37f5b7bba983d5320f5f6cfc4841e15f61634
--- /dev/null
+++ b/frontend/planner/failure_actions.py
@@ -0,0 +1,17 @@
+import common
+from autotest_lib.client.common_lib import enum, utils
+
+
+def _site_host_actions_dummy():
+    return []
+
+_site_host_actions = utils.import_site_function(
+        __file__, 'autotest_lib.frontend.planner.site_failure_actions',
+        'site_host_actions', _site_host_actions_dummy)
+
+HostAction = enum.Enum(
+        string_values=True,
+        *(_site_host_actions() + ['Block', 'Unblock', 'Reinstall']))
+
+
+TestAction = enum.Enum('Skip', 'Rerun', string_values=True)