ci: move capi and aui back to compose.test.yml

nmshd · Jul 5, 2024 · f30ebca · f30ebca
1 parent 04d1603
commit f30ebca
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 41 deletions.
diff --git a/.ci/compose.test.aui.yml b/.ci/compose.test.aui.yml
diff --git a/.ci/compose.test.capi.yml b/.ci/compose.test.capi.yml
diff --git a/.ci/compose.test.yml b/.ci/compose.test.yml
@@ -1,4 +1,40 @@
 services:
+  consumer-api:
+    container_name: consumer-api-test
+    hostname: consumer-api
+    image: consumer-api:0.0.1
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "5000:8080"
+    depends_on:
+      database-migrator:
+        condition: service_completed_successfully
+      rabbitmq:
+        condition: service_started
+      azure-storage-emulator:
+        condition: service_started
+    configs:
+      - source: Config
+        target: app/appsettings.override.json
+
+  admin-ui:
+    container_name: admin-ui-test
+    hostname: admin-ui
+    image: admin-ui:0.0.1
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "5173:8080"
+    depends_on:
+      database-migrator:
+        condition: service_completed_successfully
+      rabbitmq:
+        condition: service_started
+    configs:
+      - source: Config
+        target: app/appsettings.override.json
+
   event-handler-service:
     container_name: event-handler-service-test
     image: event-handler-service:0.0.1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -246,18 +246,18 @@ jobs:
 
       - name: Start compose stack
         run: |
-          docker compose -f ./.ci/compose.test.yml -f ./.ci/compose.test.${{matrix.database}}.yml -f ./.ci/compose.test.aui.yml -f ./.ci/compose.test.capi.yml down -v
-          docker compose -f ./.ci/compose.test.yml -f ./.ci/compose.test.${{matrix.database}}.yml -f ./.ci/compose.test.aui.yml -f ./.ci/compose.test.capi.yml up --no-build --wait -d
+          docker compose -f ./.ci/compose.test.yml -f ./.ci/compose.test.${{matrix.database}}.yml down -v
+          docker compose -f ./.ci/compose.test.yml -f ./.ci/compose.test.${{matrix.database}}.yml up --no-build --wait -d
 
       - name: Run integration tests
-        run: dotnet test --no-restore --no-build --logger "GitHubActions;summary.includeNotFoundTests=false" ${{matrix.test-project.path}}
+        run: dotnet test --no-restore --no-build --logger "GitHubActions;summary.includeNotFoundTests=false;summary.includeSkippedTests=false;summary.includePassedTests=false" ${{matrix.test-project.path}}
         env:
           ADMIN_API_BASE_ADDRESS: "http://localhost:5173"
           CONSUMER_API_BASE_ADDRESS: "http://localhost:5000"
 
       - name: Save Docker Logs
         if: failure()
-        run: docker compose -f ./.ci/compose.test.yml -f ./.ci/compose.test.${{matrix.database}}.yml -f ./.ci/compose.test.aui.yml -f ./.ci/compose.test.capi.yml logs > logs.txt
+        run: docker compose -f ./.ci/compose.test.yml -f ./.ci/compose.test.${{matrix.database}}.yml logs > logs.txt
 
       - name: Archive logs
         if: failure()
@@ -304,7 +304,7 @@ jobs:
         run: ./backbone/.ci/loadDockerImages.sh
 
       - name: Start compose stack
-        run: docker compose -f ./backbone/.ci/compose.test.yml -f ./backbone/.ci/compose.test.${{matrix.database}}.yml -f ./backbone/.ci/compose.test.capi.yml up --no-build --wait -d
+        run: docker compose -f ./backbone/.ci/compose.test.yml -f ./backbone/.ci/compose.test.${{matrix.database}}.yml up --no-build --wait -d
 
       - name: Install runtime dependencies
         working-directory: ./runtime