Ensure elasticsearch is cleaned up properly

Also, turn of logging for elasticsearch
CDCgov · Apr 13, 2018 · eb1c2df · eb1c2df
1 parent cf7d3f2
commit eb1c2df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -90,7 +90,7 @@ pipeline {
           echo "Destroying test database..."
           sh 'oc delete pods,dc,rc,services,secrets -l testdb=${svcname}'
           echo "Destroying elasticsearch..."
-          sh 'oc delete pods,dc,rc,services,secrets -l elastichost=${svcname}'
+          sh 'oc delete pods,dc,rc,services,secrets -l name=${esname}'
           echo "Archiving test artifacts..."
           archiveArtifacts artifacts: '**/reports/coverage/*, **/reports/mini_test/*',
             fingerprint: true

diff --git a/config/settings/test.yml b/config/settings/test.yml
@@ -1,5 +1,5 @@
 default_url_helper_host: "localhost:3000"
 elasticsearch:
-  log: true
+  log: false
   host: <%= ENV['ES_HOST'] || 'http://example.com:9200' %>
   adapter: :net_http