feat: Enhance CI workflow with coverage results directory and update Dockerfile for health checks

Signed-off-by: Soeren Magnus Olesen <soeren@molesen.ch>

Author: df49b9cd

.github/workflows/ci.yml

@@ -42,19 +42,22 @@ jobs:
 
     - name: Test (unit)
       run: |
-        dotnet test --no-build --configuration Release --verbosity normal --collect:"XPlat Code Coverage" tests/Odin.Core.Tests/Odin.Core.Tests.csproj
-        dotnet test --no-build --configuration Release --verbosity normal tests/Odin.ExecutionEngine.Tests/Odin.ExecutionEngine.Tests.csproj
-        dotnet test --no-build --configuration Release --verbosity normal tests/Odin.Sdk.Tests/Odin.Sdk.Tests.csproj
+        mkdir -p TestResults
+        dotnet test --no-build --configuration Release --verbosity normal --results-directory TestResults --collect:"XPlat Code Coverage" tests/Odin.Core.Tests/Odin.Core.Tests.csproj
+        dotnet test --no-build --configuration Release --verbosity normal --results-directory TestResults --collect:"XPlat Code Coverage" tests/Odin.ExecutionEngine.Tests/Odin.ExecutionEngine.Tests.csproj
+        dotnet test --no-build --configuration Release --verbosity normal --results-directory TestResults --collect:"XPlat Code Coverage" tests/Odin.Persistence.Tests/Odin.Persistence.Tests.csproj
+        dotnet test --no-build --configuration Release --verbosity normal --results-directory TestResults --collect:"XPlat Code Coverage" tests/Odin.Sdk.Tests/Odin.Sdk.Tests.csproj
+        dotnet test --no-build --configuration Release --verbosity normal --results-directory TestResults --collect:"XPlat Code Coverage" tests/Odin.ControlPlane.Grpc.Tests/Odin.ControlPlane.Grpc.Tests.csproj
 
     - name: Test (integration)
-      run: dotnet test --no-build --configuration Release --verbosity normal tests/Odin.Integration.Tests/Odin.Integration.Tests.csproj
+      run: dotnet test --no-build --configuration Release --verbosity normal --results-directory TestResults --collect:"XPlat Code Coverage" tests/Odin.Integration.Tests/Odin.Integration.Tests.csproj
       env:
         DOCKER_HOST: unix:///var/run/docker.sock
 
     - name: Upload coverage reports
       uses: codecov/codecov-action@v3
       with:
-        files: '**/coverage.cobertura.xml'
+        files: 'TestResults/**/coverage.cobertura.xml'
         fail_ci_if_error: false
 
   lint:

Dockerfile

@@ -59,6 +59,8 @@ RUN dotnet publish src/Odin.Cli/Odin.Cli.csproj -c Release -o /app/publish/cli -
 FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime-api
 WORKDIR /app
 COPY --from=publish-api /app/publish/api .
+RUN apt-get update && apt-get install -y --no-install-recommends curl && rm -rf /var/lib/apt/lists/*
+HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 CMD curl -f http://localhost:8080/ || exit 1
 EXPOSE 8080
 EXPOSE 8081
 ENTRYPOINT ["dotnet", "Odin.ControlPlane.Api.dll"]
@@ -67,6 +69,8 @@ ENTRYPOINT ["dotnet", "Odin.ControlPlane.Api.dll"]
 FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime-grpc
 WORKDIR /app
 COPY --from=publish-grpc /app/publish/grpc .
+RUN apt-get update && apt-get install -y --no-install-recommends curl && rm -rf /var/lib/apt/lists/*
+HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 CMD curl -f http://localhost:7233/ || exit 1
 EXPOSE 7233
 ENTRYPOINT ["dotnet", "Odin.ControlPlane.Grpc.dll"]
 
@@ -83,7 +87,7 @@ COPY --from=publish-workerhost /app/publish/workerhost .
 ENTRYPOINT ["dotnet", "Odin.WorkerHost.dll"]
 
 # Runtime stage - CLI
-FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime-cli
+FROM mcr.microsoft.com/dotnet/runtime:10.0 AS runtime-cli
 WORKDIR /app
 COPY --from=publish-cli /app/publish/cli .
 ENTRYPOINT ["dotnet", "Odin.Cli.dll"]

docker-compose.yml

@@ -3,6 +3,7 @@ version: '3.8'
 services:
   # PostgreSQL for persistence
   postgres:
+    profiles: ["core"]
     image: postgres:14
     container_name: odin-postgres
     environment:
@@ -21,6 +22,7 @@ services:
 
   # Elasticsearch for visibility (optional)
   elasticsearch:
+    profiles: ["observability"]
     image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
     container_name: odin-elasticsearch
     environment:
@@ -39,6 +41,7 @@ services:
 
   # OpenTelemetry Collector
   otel-collector:
+    profiles: ["observability"]
     image: otel/opentelemetry-collector-contrib:0.91.0
     container_name: odin-otel-collector
     command: ["--config=/etc/otel-collector-config.yaml"]
@@ -54,6 +57,7 @@ services:
 
   # Jaeger for distributed tracing
   jaeger:
+    profiles: ["observability"]
     image: jaegertracing/all-in-one:1.51
     container_name: odin-jaeger
     ports:
@@ -64,6 +68,7 @@ services:
 
   # Prometheus for metrics
   prometheus:
+    profiles: ["observability"]
     image: prom/prometheus:v2.48.0
     container_name: odin-prometheus
     command:
@@ -79,6 +84,7 @@ services:
 
   # Grafana for visualization
   grafana:
+    profiles: ["observability"]
     image: grafana/grafana:10.2.2
     container_name: odin-grafana
     ports:
@@ -95,6 +101,7 @@ services:
 
   # Odin Control Plane gRPC Service
   odin-grpc:
+    profiles: ["core"]
     build:
       context: .
       dockerfile: Dockerfile
@@ -104,19 +111,24 @@ services:
       - "7233:7233"
     environment:
       - HUGO_ORCHESTRATOR_DB_CONNECTION=Host=postgres;Database=orchestrator;Username=odin;Password=odin_dev_password
-      - HUGO_ORCHESTRATOR_ELASTICSEARCH_URL=http://elasticsearch:9200
-      - HUGO_ORCHESTRATOR_OTLP_ENDPOINT=http://otel-collector:4317
+      - HUGO_ORCHESTRATOR_ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-http://elasticsearch:9200}
+      - HUGO_ORCHESTRATOR_OTLP_ENDPOINT=${OTLP_ENDPOINT:-http://otel-collector:4317}
       - HUGO_ORCHESTRATOR_SHARD_COUNT=512
       - HUGO_ORCHESTRATOR_HISTORY_RETENTION_DAYS=30
     depends_on:
       postgres:
         condition: service_healthy
-      otel-collector:
-        condition: service_started
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:7233/"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
   # Odin Control Plane REST API
   odin-api:
+    profiles: ["core"]
     build:
       context: .
       dockerfile: Dockerfile
@@ -127,36 +139,39 @@ services:
       - "8081:8081"
     environment:
       - HUGO_ORCHESTRATOR_DB_CONNECTION=Host=postgres;Database=orchestrator;Username=odin;Password=odin_dev_password
-      - HUGO_ORCHESTRATOR_ELASTICSEARCH_URL=http://elasticsearch:9200
-      - HUGO_ORCHESTRATOR_OTLP_ENDPOINT=http://otel-collector:4317
-      - HUGO_ORCHESTRATOR_GRPC_ENDPOINT=http://odin-grpc:7233
+      - HUGO_ORCHESTRATOR_ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-http://elasticsearch:9200}
+      - HUGO_ORCHESTRATOR_OTLP_ENDPOINT=${OTLP_ENDPOINT:-http://otel-collector:4317}
+      - HUGO_ORCHESTRATOR_GRPC_ENDPOINT=${GRPC_ENDPOINT:-http://odin-grpc:7233}
     depends_on:
       postgres:
         condition: service_healthy
       odin-grpc:
         condition: service_started
-      otel-collector:
-        condition: service_started
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
   # Odin System Workers
   odin-workers:
+    profiles: ["core"]
     build:
       context: .
       dockerfile: Dockerfile
       target: runtime-workers
     container_name: odin-workers
     environment:
       - HUGO_ORCHESTRATOR_DB_CONNECTION=Host=postgres;Database=orchestrator;Username=odin;Password=odin_dev_password
-      - HUGO_ORCHESTRATOR_OTLP_ENDPOINT=http://otel-collector:4317
-      - HUGO_ORCHESTRATOR_GRPC_ENDPOINT=http://odin-grpc:7233
+      - HUGO_ORCHESTRATOR_OTLP_ENDPOINT=${OTLP_ENDPOINT:-http://otel-collector:4317}
+      - HUGO_ORCHESTRATOR_GRPC_ENDPOINT=${GRPC_ENDPOINT:-http://odin-grpc:7233}
     depends_on:
       postgres:
         condition: service_healthy
       odin-grpc:
         condition: service_started
-      otel-collector:
-        condition: service_started
     restart: unless-stopped
 
 volumes: