[Scripts+DockerCompose] Update scripts used to run tests

.github/actions/test/api/action.yaml

@@ -26,7 +26,7 @@ runs:
 
     - name: Start oodikone (without frontend and backend)
       shell: bash
-      run: npm run oodikone:ci:setup -- --quiet-pull --wait
+      run: docker compose --file docker-compose.ci.yml up
 
     - name: Install dependencies
       shell: bash

README.md

@@ -123,6 +123,8 @@ Some useful commands are defined in `package.json` and can be run with `npm run
 
 - `npm run oodikone`: starts Oodikone with anonymized data
 - `npm run oodikone:real`: starts Oodikone with real data
+- `npm run oodikone:test`: starts Oodikone with non-persistent database (wipes after every reset)
+- `npm run oodikone:ci`: starts Oodikone in CI mode
 - `npm run updater`: starts updater with anonymized data
 - `npm run updater:real`: starts updater with real data
 - `npm run both`: starts Oodikone and updater with anonymized data

docker-compose.ci.yml

@@ -64,6 +64,7 @@ services:
     <<: *defaults
     container_name: oodikone-kone-db
     image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/kone-db
+    pull_policy: always
     environment:
       PGDATA: /data
       POSTGRES_DB: kone-db
@@ -78,6 +79,7 @@ services:
     <<: *defaults
     container_name: oodikone-user-db
     image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/user-db
+    pull_policy: always
     environment:
       PGDATA: /data
       POSTGRES_DB: user-db
@@ -104,6 +106,7 @@ services:
     <<: *defaults
     container_name: oodikone-sis-db
     image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-db
+    pull_policy: always
     environment:
       PGDATA: /data
       POSTGRES_DB: sis-db

docker-compose.test.yml

@@ -1,31 +1,27 @@
-services:
-  api-tests:
-    container_name: oodikone-api-tests
-    build:
-      context: services
-      dockerfile: backend/dev.Dockerfile
-    volumes:
-      - ./services/backend/:/opt/app-root/backend
-      - ./services/shared/:/opt/app-root/shared
-      - backend-tests-nodemod:/opt/app-root/backend/node_modules
-      - shared-tests-nodemod:/opt/app-root/shared/node_modules
-    environment:
-      CI: 'true'
-      NODE_ENV: 'test'
-      DB_URL_KONE: postgres://postgres@kone-db:5432/kone-db
-      DB_URL_USER: postgres://postgres@user-db:5432/user-db
-      FRONT_URL: http://localhost:3000
-      REDIS: redis
-      SECRET_TOKEN: test
-      SIS_DB_URL: postgres://postgres@sis-db:5432/sis-db
-      SIS_UPDATER_URL: http://sis-updater-scheduler:8082
-      JAMI_URL: 'http://jami:3003/'
-      IMPORTER_DB_API_URL: 'https://api-toska.apps.ocp-prod-0.k8s.it.helsinki.fi/importer'
-      CRYPT_KEY: 'e16730fce263d5270ba8dcf84d068a32556542455e71331880d6c1c5e4db9b4e'
-    command: npm run test
+name: oodikone
 
-volumes:
-  backend-tests-nodemod:
-    name: oodikone-backend-tests-nodemod
-  shared-tests-nodemod:
-    name: oodikone-shared-tests-nodemod
+x-defaults: &defaults
+  restart: unless-stopped
+
+x-healthcheck-defaults: &healthcheck-defaults
+  interval: 1s
+  timeout: 3s
+  retries: 30
+
+services:
+  sis-db:
+    <<: *defaults
+    container_name: oodikone-sis-db
+    image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-db
+    pull_policy: always
+    volumes: !reset [] # Remove previous volume definitions
+    environment:
+      PGDATA: /data
+      POSTGRES_DB: sis-db
+      POSTGRES_HOST_AUTH_METHOD: trust
+    shm_size: 2gb
+    ports:
+      - 12345:5432
+    healthcheck:
+      test: ['CMD', 'pg_isready', '-U', 'postgres']
+      <<: *healthcheck-defaults

package.json

@@ -17,8 +17,8 @@
     "logs:ci": "docker compose --file docker-compose.ci.yml logs backend frontend sis-updater-worker sis-updater-scheduler jami",
     "oodikone": "npm run docker:down && ./run.sh oodikone anon up --detach",
     "oodikone:real": "./run.sh oodikone real up --detach",
-    "oodikone:ci:setup": "docker compose --file docker-compose.ci.yml --profile tests up --detach",
-    "oodikone:ci:api": "docker compose --file docker-compose.test.yml up --exit-code-from api-tests",
+    "oodikone:test": "npm run docker:down && docker compose --profile oodikone up --detach && docker compose --file docker-compose.test.yml up --detach",
+    "oodikone:ci": "npm run docker:down && docker compose --file docker-compose.ci.yml up",
     "updater": "./run.sh updater anon up --detach",
     "updater:real": "./run.sh updater real up --detach",
     "both": "./run.sh both anon up --detach",