Merge "hound: clear git lockfiles before starting daemon"

docker/hound/start-container.sh

@@ -5,5 +5,8 @@ else
     if [ ! -f /var/run/config.json ]; then
         update-hound-config;
     fi
+    # Unclean shutdown can leave lockfiles that stop processing,
+    # cleanup.
+    find . -type f \( -wholename "*/.git/index.lock" -o -wholename "*/.git/shallow.lock" \) -delete -print
     /usr/local/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
 fi

zuul.d/system-config-run.yaml

@@ -493,7 +493,7 @@
       - playbooks/roles/codesearch/
       - playbooks/roles/install-docker/
       - playbooks/roles/pip3/
-      - docker/codesearch/
+      - docker/hound/
       - testinfra/test_codesearch.py
 
 - job: