Merge pull request #36 from unt-libraries/fix-docker-test-env

Make minor fixes to the Docker testing environment

Author: jthomale

.travis.yml

@@ -7,6 +7,6 @@ before_script:
   - ./build_travis_settings.sh
   - ./docker-compose.sh pull default-db-test sierra-db-test solr-test redis-appdata-test
   - ./docker-compose.sh build manage-test test
-  - ./init-dockerdata.sh test
+  - ./init-dockerdata.sh tests
 
 script: ./docker-compose.sh run --rm test

django/sierra/sierra/settings/.env.template

@@ -79,6 +79,7 @@ TEST_DEFAULT_DB_HOST=localhost
 TEST_DEFAULT_DB_PORT=3206
 TEST_SOLR_PORT=8883
 TEST_SOLR_HOST=solr.example.com
+TEST_SOLRMARC_CONFIG_FILE=test_config.properties
 TEST_SOLR_HAYSTACK_URL=http://${TEST_SOLR_HOST}:${TEST_SOLR_PORT}/solr/haystack
 TEST_SOLR_BIBDATA_URL=http://${TEST_SOLR_HOST}:${TEST_SOLR_PORT}/solr/bibdata
 TEST_SOLR_MARC_URL=http://${TEST_SOLR_HOST}:${TEST_SOLR_PORT}/solr/marc

docker-compose.yml

@@ -169,6 +169,10 @@ services:
       - redis-appdata-test
     volumes:
       - .:/project/catalog-api
+      - ./docker_data/test/logs:/project/logs
+      - ./docker_data/test/media:/project/media
+    environment:
+      - SOLRMARC_CONFIG_FILE=${TEST_SOLRMARC_CONFIG_FILE:-test_config.properties}
     working_dir: /project/catalog-api/
     networks:
       - testing
@@ -184,6 +188,8 @@ services:
       - default-db-dev
     volumes:
       - .:/project/catalog-api
+      - ./docker_data/app/logs:/project/logs
+      - ./docker_data/app/media:/project/media
     networks:
       - development
     working_dir: /project/catalog-api/django/sierra
@@ -200,11 +206,14 @@ services:
       - sierra-db-test
     volumes:
       - .:/project/catalog-api
+      - ./docker_data/test/logs:/project/logs
+      - ./docker_data/test/media:/project/media
     networks:
       - testing
     working_dir: /project/catalog-api/django/sierra
     environment:
       - DJANGO_SETTINGS_MODULE=sierra.settings.test
+      - SOLRMARC_CONFIG_FILE=${TEST_SOLRMARC_CONFIG_FILE:-test_config.properties}
     entrypoint: wait-for-it.sh -t 30 default-db-test:3306 -- wait-for-it.sh -t 30 sierra-db-test:5432 -- /project/catalog-api/django/sierra/manage.py
 
 networks:

init-dockerdata.sh

@@ -11,7 +11,7 @@ DDPATH=./docker_data
 SIERRA_FIXTURE_PATH=./django/sierra/base/fixtures
 SCRIPTNAME="$(basename "$0")"
 DEV_SERVICES=("default-db-dev" "solr-dev" "redis-celery" "redis-appdata-dev" "app" "celery-worker")
-TEST_SERVICES=("default-db-test" "sierra-db-test" "solr-test" "redis-appdata-test")
+TEST_SERVICES=("default-db-test" "sierra-db-test" "solr-test" "redis-appdata-test" "test")
 ALL_SERVICES=("${DEV_SERVICES[@]}" "${TEST_SERVICES[@]}")
 
 ### FUNCTIONS ###
@@ -29,7 +29,7 @@ function show_help {
   echo "-v        Only run volume setup on host machine (skip migrations). Cannot be"
   echo "          used with -m."
   echo "group     Provide one argument to set up multiple services. Must be \"all\","
-  echo "          \"dev\", or \"test\". \"all\" sets up all services."
+  echo "          \"dev\", or \"tests\". \"all\" sets up all services."
   echo "service   One or more service names to initialize. Note that services are set up"
   echo "          in the order specified. Use -s to see more info about services."
   echo ""
@@ -75,23 +75,26 @@ function show_services {
   echo "    The celery-worker service that runs in development. A log directory is set"
   echo "    up. No migrations."
   echo ""
-  echo "default-db-test -- test"
+  echo "default-db-test -- tests"
   echo "    The default Django MariaDB database for a test environment. Migrations are"
   echo "    needed to set up the needed Django apps. This must be set up and migrated"
   echo "    before you run initial migrations on sierra-db-test."
   echo ""
-  echo "sierra-db-test -- test"
+  echo "sierra-db-test -- tests"
   echo "    The sierra PostGreSQL database for a test environment. Migrations are"
   echo "    needed to install sierra test fixtures. But, before you run migrations for"
   echo "    the first time on sierra-db-test, you must make sure that default-db-test"
   echo "    is set up and migrated."
   echo ""
-  echo "solr-test -- test"
+  echo "solr-test -- tests"
   echo "    Empty instance of Solr for a test environment. No migrations (yet)."
   echo ""
-  echo "redis-appdata-test -- test"
+  echo "redis-appdata-test -- tests"
   echo "    Redis instance that stores some app data in test. No migrations (yet)."
   echo ""
+  echo "test -- tests"
+  echo "    Log and media directories are set up for the test environment. No "
+  echo "    migrations."
   exit 1
 }
 
@@ -273,7 +276,7 @@ for arg in $@; do
     dev)
       user_services+=("${DEV_SERVICES[@]}")
       ;;
-    test)
+    tests)
       user_services+=("${TEST_SERVICES[@]}")
       ;;
     *)
@@ -337,6 +340,10 @@ for service in ${user_services[@]}; do
     celery-worker)
       paths=("$DDPATH/celery_worker/logs")
       ;;
+    test)
+      paths=("$DDPATH/test/logs"
+             "$DDPATH/test/media")
+      ;;
     *)
       echo ""
       echo "Warning: Skipping \`$service\`. Either it is not a valid service, or it does not use data volumes."