Merge branch 'main' into NMSHDB-152-Backbone-Administrator-Display-re…

…lationships-of-an-identity

.ci/docker-compose.test.postgres.yml

@@ -1,4 +1,3 @@
-version: "3.3"
 services:
   ### infrastructure ###
 

.ci/docker-compose.test.sqlserver.yml

@@ -1,4 +1,3 @@
-version: "3.3"
 services:
   ### infrastructure ###
 

.ci/docker-compose.test.yml

@@ -1,11 +1,8 @@
-version: "3.3"
 services:
   consumer-api:
     container_name: consumer-api-test
     hostname: consumer-api
-    build:
-      context: ..
-      dockerfile: ConsumerApi/Dockerfile
+    image: consumer-api:0.0.1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     ports:
@@ -24,9 +21,7 @@ services:
   admin-ui:
     container_name: admin-ui-test
     hostname: admin-ui
-    build:
-      context: ..
-      dockerfile: AdminApi/src/AdminApi/Dockerfile
+    image: admin-ui:0.0.1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     ports:
@@ -42,9 +37,7 @@ services:
 
   event-handler-service:
     container_name: event-handler-service-test
-    build:
-      context: ..
-      dockerfile: EventHandlerService/src/EventHandlerService/Dockerfile
+    image: event-handler-service:0.0.1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     depends_on:
@@ -58,9 +51,7 @@ services:
 
   sse-server:
     container_name: sse-server-test
-    build:
-      context: ..
-      dockerfile: SseServer/src/SseServer/Dockerfile
+    image: sse-server:0.0.1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     configs:
@@ -69,9 +60,7 @@ services:
 
   database-migrator:
     container_name: database-migrator-test
-    build:
-      context: ..
-      dockerfile: DatabaseMigrator/Dockerfile
+    image: database-migrator:0.0.1
     depends_on:
       seed-database:
         condition: service_completed_successfully
@@ -109,9 +98,7 @@ services:
 
   seed-client:
     container_name: seed-client-test
-    build:
-      context: ..
-      dockerfile: Modules/Devices/src/Devices.AdminCli/Dockerfile
+    image: seed-client:0.0.1
     depends_on:
       consumer-api:
         condition: service_healthy

.ci/integrationTest.postgres.sh

@@ -5,11 +5,17 @@ dockerCompose() {
     docker compose -f ./.ci/docker-compose.test.yml -f ./.ci/docker-compose.test.postgres.yml "$@"
 }
 
-dockerCompose down
-dockerCompose build
-dockerCompose up -d
-dotnet restore "Backbone.sln"
-dotnet build --no-restore "Backbone.sln"
+{
+  dockerCompose down;
+  dockerCompose up -d --no-build
+} &
+{
+  dotnet restore "Backbone.sln";
+  dotnet build --no-restore "Backbone.sln"
+}
+wait
+
 export CONSUMER_API_BASE_ADDRESS="http://localhost:5000"
 export ADMIN_API_BASE_ADDRESS="http://localhost:5173"
+
 dotnet test --no-restore --no-build --filter "Category=Integration&TestCategory!~ignore" --logger "GitHubActions;summary.includeNotFoundTests=false" "Backbone.sln"

.ci/integrationTest.sqlserver.sh

@@ -5,11 +5,17 @@ dockerCompose() {
     docker compose -f ./.ci/docker-compose.test.yml -f ./.ci/docker-compose.test.sqlserver.yml "$@"
 }
 
-dockerCompose down
-dockerCompose build
-dockerCompose up -d
-dotnet restore "Backbone.sln"
-dotnet build --no-restore "Backbone.sln"
+{
+  dockerCompose down;
+  dockerCompose up -d --no-build
+} &
+{
+  dotnet restore "Backbone.sln";
+  dotnet build --no-restore "Backbone.sln"
+}
+wait
+
 export CONSUMER_API_BASE_ADDRESS="http://localhost:5000"
 export ADMIN_API_BASE_ADDRESS="http://localhost:5173"
+
 dotnet test --no-restore --no-build --filter "Category=Integration&TestCategory!~ignore" --logger "GitHubActions;summary.includeNotFoundTests=false" "Backbone.sln"

.ci/loadDockerImages.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+for f in /tmp/*.tar; do
+    docker load --input $f
+done