database: use another container for provd, temporarily

wazo-platform · Sep 17, 2024 · 95d8904 · 95d8904
1 parent 7f7fe9f
commit 95d8904
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/integration_tests/Makefile b/integration_tests/Makefile
@@ -1,4 +1,5 @@
-PROVD_DIR ?= ${LOCAL_GIT_REPOS}/wazo-provd/
+PROVD_DIR ?= ${LOCAL_GIT_REPOS}/wazo-provd
+PROVD_DB_DOCKERFILE_DIR ?= ${PROVD_DIR}/contribs/docker
 
 ifeq ($(MANAGE_DB_DIR),)
 	UPDATE_DB_TARGET=update-db-pull
@@ -24,6 +25,7 @@ update-db-build:
 
 build-provd:
 	docker build -t wazoplatform/wazo-provd $(PROVD_DIR)
+	docker build -t wazoplatform/wazo-provd-db-test:local -f $(PROVD_DB_DOCKERFILE_DIR)/Dockerfile-db $(PROVD_DIR)
 
 test:
 	pytest -x

diff --git a/integration_tests/assets/docker-compose.base.override.yml b/integration_tests/assets/docker-compose.base.override.yml
@@ -3,13 +3,14 @@ services:
     depends_on:
       - auth
       - postgres
+      - postgres-provd
       - provd
       - rabbitmq
       - sysconfd
       - confd
       - ari
     environment:
-      TARGETS: "ari:5039,postgres:5432,rabbitmq:5672,provd:8666,sysconfd:8668,auth:9497,confd:9486"
+      TARGETS: "ari:5039,postgres:5432,postgres-provd:5432,rabbitmq:5672,provd:8666,sysconfd:8668,auth:9497,confd:9486"
 
   postgres:
     command: "-c 'log_min_duration_statement=0'"

diff --git a/integration_tests/assets/docker-compose.wizard.override.yml b/integration_tests/assets/docker-compose.wizard.override.yml
@@ -3,12 +3,13 @@ services:
     depends_on:
       - auth
       - postgres
+      - postgres-provd
       - provd
       - rabbitmq
       - sysconfd
       - confd
     environment:
-      TARGETS: "postgres:5432,rabbitmq:5672,provd:8666,sysconfd:8668,auth:9497,confd:9486"
+      TARGETS: "postgres:5432,postgres-provd:5432,rabbitmq:5672,provd:8666,sysconfd:8668,auth:9497,confd:9486"
 
   postgres:
     image: wazoplatform/wazo-confd-db

diff --git a/integration_tests/assets/docker-compose.yml b/integration_tests/assets/docker-compose.yml
@@ -26,6 +26,11 @@ services:
     ports:
       - "5432"
 
+  postgres-provd:
+    image: wazoplatform/wazo-provd-db-test:local
+    ports:
+      - "5432"
+
   rabbitmq:
     image: rabbitmq
     ports:

diff --git a/integration_tests/assets/etc/wazo-provd/config.yml b/integration_tests/assets/etc/wazo-provd/config.yml
@@ -3,4 +3,4 @@ rest_api:
 auth:
   host: auth
 database:
-  uri: postgresql://asterisk:proformatique@postgres/asterisk
+  uri: postgresql://wazo-provd:Secr7t@postgres-provd/wazo-provd