Reenable upgrade CI path.

.travis.yml

@@ -22,12 +22,12 @@ matrix:
       dist: xenial
     # Salt from previous configuration
     # Disabled temporarily while previous configuration on master is busted.
-    #- env:
-    #    - SALT_NODE_ID=servo-master1
-    #    - SALT_FROM_SCRATCH=false
-    #  os: linux
-    #  sudo: required
-    #  dist: xenial
+    - env:
+        - SALT_NODE_ID=servo-master1
+        - SALT_FROM_SCRATCH=false
+      os: linux
+      sudo: required
+      dist: xenial
     # Not a Salt node, runs test suite instead
     - env:
         - SALT_NODE_ID=test

admin/init.sls

@@ -7,10 +7,8 @@ admin-packages:
       - tmux
       - mosh
 
-{% if grains.get('virtual_subtype', '') != 'Docker' %}
 UTC:
     timezone.system
-{% endif %}
 
 /etc/hosts:
   file.managed:

homu/init.sls

@@ -46,7 +46,6 @@ homu:
     - bin_env: /home/servo/homu/_venv
     - require:
       - virtualenv: homu
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - require:
@@ -55,7 +54,6 @@ homu:
       - file: /home/servo/homu/cfg.toml
       - file: /lib/systemd/system/homu.service
       - pip: homu
-  {% endif %}
 
 {{ salt['file.dirname'](homu.db) }}:
   file.directory:

intermittent-failure-tracker/init.sls

@@ -25,7 +25,6 @@ intermittent-failure-tracker:
     - upgrade: True
     - require:
       - virtualenv: intermittent-failure-tracker
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - name: failure-tracker
@@ -35,7 +34,6 @@ intermittent-failure-tracker:
       - file: /home/servo/intermittent-failure-tracker/config.json
       - file: /lib/systemd/system/failure-tracker.service
       - pip: intermittent-failure-tracker
-  {% endif %}
 
 /home/servo/intermittent-failure-tracker/config.json:
   file.managed:

intermittent-tracker/init.sls

@@ -26,7 +26,6 @@ intermittent-tracker:
     - upgrade: True
     - require:
       - virtualenv: intermittent-tracker
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - name: tracker
@@ -36,7 +35,6 @@ intermittent-tracker:
       - file: /home/servo/intermittent-tracker/config.json
       - file: /lib/systemd/system/tracker.service
       - pip: intermittent-tracker
-  {% endif %}
 
 /home/servo/intermittent-tracker/config.json:
   file.managed:

nginx/init.sls

@@ -1,14 +1,12 @@
 nginx:
   pkg.installed: []
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - watch:
       - pkg: nginx
       - file: /etc/nginx/sites-available/default
     - require:
       - cmd: create-cert
-  {% endif %}
 
 /etc/nginx/sites-available/default:
   file.managed:

salt/master.sls

@@ -16,10 +16,8 @@ salt-master-dependencies:
     - user: root
     - group: root
     - mode: 755
-    {% if grains.get('virtual_subtype', '') != 'Docker' %}
     - require_in:
       - service: salt-master
-    {% endif %}
 
 {% if loop.index0 > 0 %}
 # Only the very first base file root should be used for testing
@@ -32,32 +30,26 @@ salt-master-dependencies:
     - group: root
     - mode: 644
     - source: salt://{{ tpldir }}/files/master/ADMIN_README
-    {% if grains.get('virtual_subtype', '') != 'Docker' %}
     - require_in:
       - service: salt-master
-    {% endif %}
 
 {{ rootfs_parent_dir }}/setup.sh:
   file.managed:
     - user: root
     - group: root
     - mode: 755
     - source: salt://{{ tpldir }}/files/master/setup.sh
-    {% if grains.get('virtual_subtype', '') != 'Docker' %}
     - require_in:
       - service: salt-master
-    {% endif %}
 
 {{ rootfs_parent_dir }}/cleanup.sh:
   file.managed:
     - user: root
     - group: root
     - mode: 755
     - source: salt://{{ tpldir }}/files/master/cleanup.sh
-    {% if grains.get('virtual_subtype', '') != 'Docker' %}
     - require_in:
       - service: salt-master
-    {% endif %}
 {% endfor %}
 
 salt-master:
@@ -67,13 +59,11 @@ salt-master:
     - require:
       - sls: salt.common
       - pkg: salt-master-dependencies
-  {% if grains.get('virtual_subtype', '') != 'Docker' %}
   service.running:
     - enable: True
     - require:  # Updates and upgrades must be handled manually
       - file: /etc/salt/master
       - pkg: salt-master
-  {% endif %}
 
 /etc/salt/master:
   file.managed: