[CI] Change api tests to use docker-compose.ci.yml

.github/workflows/test.yaml

@@ -226,11 +226,11 @@ jobs:
         with:
           node-version: 24
 
-      - name: Start oodikone detached
-        run: npm run oodikone:test:setup
+      - name: Start oodikone (without frontend and backend)
+        run: npm run oodikone:ci:setup
 
       - name: Run api-tests
-        run: npm run oodikone:test:api
+        run: npm run oodikone:ci:api
 
   # === End-to-end tests ===
   test_end_to_end:

docker-compose.ci.yml

@@ -25,6 +25,8 @@ services:
     build:
       context: services
       dockerfile: backend/Dockerfile
+    profiles:
+      - oodikone
 
   frontend:
     <<: *defaults
@@ -32,6 +34,8 @@ services:
     build:
       context: services
       dockerfile: frontend/Dockerfile
+    profiles:
+      - oodikone
 
   kone-db:
     <<: *defaults
@@ -101,6 +105,8 @@ services:
       - 1337:80
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf
+    profiles:
+      - oodikone
 
   # Following services are used to run sis-updater-worker when anon sis-db needs to be updated. Could probably also use production version, but this certainly works.
   sis-importer-db:

docker-compose.yml

@@ -69,7 +69,6 @@ services:
     image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/kone-db
     profiles:
       - oodikone
-      - tests
     volumes:
       - kone-db-data:/data
 
@@ -157,7 +156,6 @@ services:
     image: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/user-db
     profiles:
       - oodikone
-      - tests
     volumes:
       - user-db-data:/data
 

package.json

@@ -16,8 +16,8 @@
     "cli": "./cli.sh",
     "oodikone": "./run.sh oodikone anon up --detach",
     "oodikone:real": "./run.sh oodikone real up --detach",
-    "oodikone:test:setup": "./run.sh tests api up --detach",
-    "oodikone:test:api": "docker compose --file docker-compose.test.yml up --exit-code-from api-tests",
+    "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",
     "updater": "./run.sh updater anon up --detach",
     "updater:real": "./run.sh updater real up --detach",
     "both": "./run.sh both anon up --detach",

run.sh

@@ -71,7 +71,7 @@ parse_env() {
     env="--file docker-compose.yml --file docker-compose.real.yml"
   fi
   if [[ "$version" == "api" ]]; then
-    env="--file docker-compose.yml"
+    env="--file docker-compose.ci.yml"
   fi
   return 0
 }