Skip to content

Commit

Permalink
chore: add solr9 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tobybellwood authored Mar 27, 2024
1 parent f9ee62a commit 9c7ddd4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
5 changes: 5 additions & 0 deletions TESTING_dockercompose.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ docker run --rm --net internal-services-test_default jwilder/dockerize dockerize
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://redis-6:6379 -timeout 1m
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://redis-7:6379 -timeout 1m
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://solr-8:8983 -timeout 1m
docker run --rm --net internal-services-test_default jwilder/dockerize dockerize -wait tcp://solr-9:8983 -timeout 1m

# commons should be running Alpine Linux
docker compose exec -T commons sh -c "cat /etc/os-release" | grep "Alpine Linux"
Expand Down Expand Up @@ -72,6 +73,10 @@ docker compose exec -T commons sh -c "curl -kL http://go-web:3000/redis?service=
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/solr?service=solr-8" | grep "SERVICE_HOST=solr-8"
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/solr?service=solr-8" | grep "LAGOON_TEST_VAR=internal-services-test"

# solr-9 should be able to read/write data
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/solr?service=solr-9" | grep "SERVICE_HOST=solr-9"
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/solr?service=solr-9" | grep "LAGOON_TEST_VAR=internal-services-test"

# persistent storage should be able to read/write data
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/storage?path=/app/files" | grep "STORAGE_PATH=/app/files/storage.txt"
docker compose exec -T commons sh -c "curl -kL http://go-web:3000/storage?path=/app/files" | grep "LAGOON_TEST_VAR=internal-services-test"
Expand Down
15 changes: 14 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '2'

volumes:
solr-7-data:
solr-8-data:
solr-9-data:
opensearch-2-data:
scratch:

Expand Down Expand Up @@ -114,3 +114,16 @@ services:
command:
- solr-precreate
- mycore

solr-9:
image: uselagoon/solr-9:latest
labels:
lagoon.type: solr
lagoon.persistent.size: 100Mi
ports:
- "8983"
volumes:
- solr-9-data:/var/solr
command:
- solr-precreate
- mycore

0 comments on commit 9c7ddd4

Please sign in to comment.