Merge remote branch 'origin/upstream' into tempbranch

frontend/migrations/057_add_planner_triage_actions.py

Index: frontend/migrations/057_add_planner_triage_actions.py
diff --git a/frontend/migrations/057_add_planner_triage_actions.py b/frontend/migrations/057_add_planner_triage_actions.py
new file mode 100644
index 0000000000000000000000000000000000000000..5f6d97b88567ba273660a5c8b6a6e9b6182a103f
--- /dev/null
+++ b/frontend/migrations/057_add_planner_triage_actions.py
@@ -0,0 +1,15 @@
+UP_SQL = """
+ALTER TABLE planner_test_runs
+ADD COLUMN invalidated TINYINT(1) DEFAULT FALSE;
+
+ALTER TABLE planner_test_jobs
+ADD COLUMN requires_rerun TINYINT(1) DEFAULT FALSE;
+"""
+
+DOWN_SQL = """
+ALTER TABLE planner_test_jobs
+DROP COLUMN requires_rerun;
+
+ALTER TABLE planner_test_runs
+DROP COLUMN invalidated;
+"""