Sync service-specific test database identity

Author: saramonzon

.bu-isciii-deployment/state.json

@@ -55,19 +55,19 @@
     "conf/apache/apache_production_settings.txt": "0f93c9a911b56c54966c39fda01f4f44c52fbd1cf902f2480ce35b90b721f89a",
     "conf/apache/apache_test_settings.txt": "b024cd4ea169536317d8dd0030ce85b03e338350a5e18ba15cf3685adebea7d4",
     "conf/docker_production_settings.txt": "1700b63ff6bc792ce21801fd492a2827ffa74393412b3d392ea1925ab2bb199e",
-    "conf/docker_test_settings.txt": "668b16e2eec8241b8abc64c02dab18d5bec677a04692d0235fd4e87d09e54f02",
+    "conf/docker_test_settings.txt": "12d65639484be31c40c036f04ce4e6911ca6aaddecb1a03232ee0877dc2c2b09",
     "conf/nextstrain/nextstrain_production_settings.txt": "b2d64f4f1c8594ec135c1db1efa13f9d346f36398684063c286ea3554beb5491",
     "conf/nextstrain/nextstrain_test_settings.txt": "f36dbc829add8f17e26f0c0504a3f3493806967909fe131c2dc860f5d05c1b2f",
     "conf/samba/samba_production_settings.txt": "f19da30ab0890a79254e22c571629b34de2d37ad9c12449607158bff9a9188a1",
     "conf/samba/samba_test_settings.txt": "c383b88d43de8d65886cdd2b45bf9f27d91f5f3fe290f8f82378578fbeeff0b2",
-    "conf/template_settings.py": "411ef00bcae1d3fd6d7fd3acf9b3d8e2627447bdc1bb9ae670e1a7bf87e809a6",
+    "conf/template_settings.py": "5a850d3f2cafa90afd35d8a031f635502228148baef0c03ba5a110ab88ac1fd2",
     "container_install.sh": "7ac40184f72886caee1da8380a1f0cbf002d40c701d4904218a64dcd2f680389",
     "deployment_health/README.md": "3d7c4295938708813369deeac9edc0eb8fe2153c77d03f9138febf3aed715aa5",
     "deployment_health/__init__.py": "bedcff132309f8970b1ca72fcea20c7cb38bb727d48f82d96dbf7104922abda0",
     "deployment_health/urls.py": "8d274b44d326f26d71b05021a34969c742478efbe47691aadd8c3a90ba16f340",
     "deployment_health/views.py": "d19cc3e8fef8519bae2b7fbdc25d17f6ae7df02479aa8890f4b4d250bb07f2e4",
     "docker-compose.prod.yml": "30df3b5bf90a4d88a81a2d577c34a5f7066c4ee02e2ffccdea4ef7c488a19619",
-    "docker-compose.test.yml": "86f2ec8a4da1a1d537de58265b0dad9fd73c50173f05659c7171cd9db91de434",
+    "docker-compose.test.yml": "57d291d137b5edd47fe0e32dd96b78201172f5a256e5d5edcf6043a2cbbd9e3c",
     "install.sh": "74a3662bbbe9cb469845660a35310b73ad2e5857743b93fbade13135e0711eac",
     "nextstrain/Dockerfile": "f1a3426c2ac065ddb0841e21d657f068c9584e47b8193077cd3bd85e15391335",
     "nextstrain/auspice-config.json": "6fc666bf5a0d05293dfdb6cc6b0800637e52c3335bda065b78c036fb6af0d7af",

conf/docker_test_settings.txt

@@ -23,7 +23,7 @@ HOST_LOG_PATH='/tmp/relecov-platform/logs'
 DJANGO_SETTINGS_PATH='/tmp/relecov-platform/data/settings/relecov_platform/settings.py'
 
 ### Compose test database
-DB_HOST='relecov_platform_app_db'
+DB_HOST='app_db'
 DB_PORT='3306'
 DB_NAME='relecov_platform'
 DB_USER='django'

conf/template_settings.py

@@ -5,6 +5,7 @@
 selected production or test installation settings file.
 """
 
+import os
 from pathlib import Path
 
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -77,7 +78,7 @@
         "NAME": "djangodbname",
         "USER": "djangouser",
         "PASSWORD": "djangopass",
-        "HOST": "djangohost",
+        "HOST": os.getenv("DB_HOST", "djangohost"),
         "PORT": "djangoport",
         "CONN_MAX_AGE": dbconnmaxage,
     }

docker-compose.test.yml

@@ -24,15 +24,15 @@ services:
       APP_INSTALL_PATH: ${APP_INSTALL_PATH:?APP_INSTALL_PATH is required}
       APP_PORT: ${APP_APP_PORT:?APP_APP_PORT is required}
       PROJECT_MODULE: "relecov_platform"
-      DB_HOST: relecov_platform_app_db
+      DB_HOST: app_db
       DB_PORT: ${APP_DB_PORT:?APP_DB_PORT is required}
       DB_NAME: ${APP_DB_NAME:?APP_DB_NAME is required}
       DB_USER: ${APP_DB_USER:?APP_DB_USER is required}
       DB_PASSWORD: ${APP_DB_PASSWORD:?APP_DB_PASSWORD is required}
       DJANGO_SECRET_KEY: ${APP_DJANGO_SECRET_KEY:?APP_DJANGO_SECRET_KEY is required}
       DJANGO_ALLOWED_HOSTS: ${APP_DJANGO_ALLOWED_HOSTS:?APP_DJANGO_ALLOWED_HOSTS is required}
     depends_on:
-      relecov_platform_app_db:
+      app_db:
         condition: service_healthy
     volumes:
       - app_test_documents:${APP_INSTALL_PATH:?APP_INSTALL_PATH is required}/documents:z
@@ -164,7 +164,7 @@ services:
       - samba_test_data:/mnt:z
     networks: [deployment_net]
   # END BU-ISCIII ADDON: samba
-  relecov_platform_app_db:
+  app_db:
     image: docker.io/library/mysql:8.0
     environment:
       MYSQL_DATABASE: ${APP_DB_NAME:?APP_DB_NAME is required}