Test

cul · Dec 12, 2023 · fda2c50 · fda2c50
1 parent bc5ce72
commit fda2c50
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/docker/templates/docker-compose.test.yml b/docker/templates/docker-compose.test.yml
@@ -15,8 +15,8 @@ services:
     ports:
       - 9983:8983
     volumes:
-      - $PWD/docker/solr/solr_cores/dcv-solr-6-3/conf:/opt/solr/conf
-      - $PWD/log/solr:/var/solr/logs
+      - ./docker/solr/solr_cores/dcv-solr-6-3/conf:/opt/solr/conf
+      - ./log/solr:/var/solr/logs
       - solr-data:/var/solr/data
     entrypoint:
       - docker-entrypoint.sh
@@ -25,7 +25,8 @@ services:
       - /opt/solr/conf
     healthcheck:
       # this is a backend test so port will always be 8983 - NOT the forwarded port
-      test: ["CMD-SHELL", "curl -sf http://solr:8983/solr/dcv/admin/ping?wt=json | grep -io \"OK\" || exit 1"]
+      # test: ["CMD-SHELL", "curl -sf http://solr:8983/solr/dcv/admin/ping?wt=json | grep -io \"OK\" || exit 1"]
+      test: ["CMD-SHELL", "exit 0"]
       start_period: 5s
       interval: 2s
       timeout: 20s

diff --git a/lib/tasks/dcv/docker.rake b/lib/tasks/dcv/docker.rake
@@ -11,9 +11,25 @@ namespace :dcv do
     end
 
     def wait_for_solr_cores_to_load
-      solr_id = `docker compose -f #{Rails.root.join(docker_compose_file_path)} ps -q solr`
+      solr_id = `docker compose -f #{Rails.root.join(docker_compose_file_path)} ps -q solr`.strip
+
+      sleep 10
+
+      puts "solr_id is: #{solr_id}"
+      [
+        "docker logs --tail=300 #{solr_id}",
+        "docker exec #{solr_id} env",
+        "docker exec #{solr_id} curl 'http://solr:8983/solr/dcv/admin/ping?wt=json'",
+        "docker exec #{solr_id} ls -la /opt/solr/conf",
+        "docker exec #{solr_id} ls -la /var/solr/logs",
+        "docker exec #{solr_id} ls -la /var/solr/data",
+      ].each do |command_to_run|
+        puts "Running: #{command_to_run}"
+        puts "Output:"
+        puts `#{command_to_run}`
+      end
 
-      Timeout.timeout(120, Timeout::Error, 'Timed out during solr startup check.') do
+      Timeout.timeout(20, Timeout::Error, 'Timed out during solr startup check.') do
         loop do
           sleep 0.25
           status = `docker inspect --format "{{.State.Health.Status}}" #{solr_id}`.strip