From a2934d015b300086b1f6194f5b69d785ebaf4df0 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 25 Oct 2017 19:14:36 -0400
Subject: [PATCH 1/2] Ensure that intermittent-tracker is always upgraded when
 the revision changes.

---
 intermittent-tracker/init.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/intermittent-tracker/init.sls b/intermittent-tracker/init.sls
index be2aa286..8975b332 100644
--- a/intermittent-tracker/init.sls
+++ b/intermittent-tracker/init.sls
@@ -21,6 +21,7 @@ intermittent-tracker:
     - pkgs:
       - git+https://github.com/servo/intermittent-tracker@{{ tracker.rev }}
     - bin_env: /home/servo/intermittent-tracker/_venv
+    - upgrade: True
     - require:
       - virtualenv: intermittent-tracker
   {% if grains.get('virtual_subtype', '') != 'Docker' %}

From 8926beb3e5fbd8077143df077bd2deb8b2a8ac98 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 25 Oct 2017 19:15:12 -0400
Subject: [PATCH 2/2] Make intermittent-failure-tracker server start up
 successfully.

---
 intermittent-failure-tracker/init.sls  | 12 ++++++++++++
 intermittent-failure-tracker/map.jinja |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/intermittent-failure-tracker/init.sls b/intermittent-failure-tracker/init.sls
index 37fcab1e..be91fe8e 100644
--- a/intermittent-failure-tracker/init.sls
+++ b/intermittent-failure-tracker/init.sls
@@ -9,6 +9,10 @@ intermittent-failure-tracker:
     - venv_bin: virtualenv-3.5
     - python: python3
     - system_site_packages: False
+    - pip_pkgs:
+      # This package is required to install the non-code resources that are present
+      # in the tracker package's git repository.
+      - setuptools-git
     - require:
       - pkg: python3
       - pip: virtualenv
@@ -16,6 +20,7 @@ intermittent-failure-tracker:
     - pkgs:
       - git+https://github.com/servo/intermittent-failure-tracker@{{ tracker.rev }}
     - bin_env: /home/servo/intermittent-failure-tracker/_venv
+    - upgrade: True
     - require:
       - virtualenv: intermittent-failure-tracker
   {% if grains.get('virtual_subtype', '') != 'Docker' %}
@@ -37,6 +42,12 @@ intermittent-failure-tracker:
     - group: servo
     - mode: 644
 
+/home/servo/intermittent-failure-tracker/intermittent_errors.json:
+  file.managed:
+    - user: servo
+    - group: servo
+    - mode: 644
+
 /etc/init/failure-tracker.conf:
   file.managed:
     - source: salt://{{ tpldir }}/files/tracker.conf
@@ -46,3 +57,4 @@ intermittent-failure-tracker:
     - require:
       - pip: intermittent-failure-tracker
       - file: /home/servo/intermittent-failure-tracker/config.json
+      - file: /home/servo/intermittent-failure-tracker/intermittent_errors.json
diff --git a/intermittent-failure-tracker/map.jinja b/intermittent-failure-tracker/map.jinja
index bede9bb1..3fd7a1f4 100644
--- a/intermittent-failure-tracker/map.jinja
+++ b/intermittent-failure-tracker/map.jinja
@@ -1,5 +1,5 @@
 {%
   set tracker = {
-    'rev': '37ef73bb0059e0555a903e758dae8006c46a9916'
+    'rev': 'f2f3825b6b026b54769a995ae8a526b2d81ee5fd'
   }
 %}