update ci build/test setup

Author: artcz

.github/workflows/build_test_and_lint.yml

@@ -36,19 +36,19 @@ jobs:
           -e DATABASE_URL=postgres://testuser:testpassword@localhost:5432/testdb \
           --network host \
           intbot \
-          make test
+          make in-container/tests
 
     services:
       postgres:
         image: postgres:16.4
         env:
-          POSTGRES_USER: testuser
-          POSTGRES_PASSWORD: testpassword
-          POSTGRES_DB: testdb
+          POSTGRES_USER: intbot_user
+          POSTGRES_PASSWORD: intbot_password
+          POSTGRES_DB: intbot_database_test
         ports:
-          - 5432:5432
+          - 14672:5432
         options: >-
-          --health-cmd="pg_isready -U testuser -d testdb"
+          --health-cmd="pg_isready -U intbot_user -d intbot_database_test"
           --health-interval=10s
           --health-timeout=5s
           --health-retries=5

Makefile

@@ -7,7 +7,10 @@ UV_RUN_DEV=cd intbot && DJANGO_ENV="dev" uv run
 
 # Docker
 DOCKER_RUN_WITH_PORT=docker run -p 4672:4672 --add-host=host.internal:host-gateway -e DJANGO_ENV="local_container" -it intbot:$(V)
+DOCKER_RUN=docker run --add-host=host.internal:host-gateway -e DJANGO_ENV="test" -it intbot:$(V)
 MANAGE=cd intbot && ./manage.py
+# In container we run with migrations
+CONTAINER_TEST_CMD=DJANGO_SETTINGS_MODULE="intbot.settings" DJANGO_ENV="test" pytest --migrations
 
 # Deployment
 DEPLOY_CMD=cd deploy && uvx --from "ansible-core" ansible-playbook -i hosts.yml
@@ -108,6 +111,9 @@ in-container/migrate:
 in-container/manage:
 	$(MANAGE) $(ARG)
 
+in-container/tests:
+	$(CONTAINER_TEST_CMD) -vvv
+
 
 # Docker management targets
 # =========================
@@ -118,6 +124,9 @@ docker/build:
 docker/run/gunicorn:
 	$(DOCKER_RUN_WITH_PORT) make in-container/gunicorn
 
+docker/run/tests:
+	$(DOCKER_RUN) make in-container/tests
+
 
 # Deploymenet targets
 # ====================