From 5a61d27f8759070a8c759d54197a53fa3b5b373a Mon Sep 17 00:00:00 2001
From: Brian Ginsburg <gins@brianginsburg.com>
Date: Tue, 17 Dec 2024 11:26:58 -0800
Subject: [PATCH] test: Rework integration tests

We need to run the solver integration tests before starting the resource
provider for the main integration tests. Also, moved to running the
solver and resource provider directly from Go and only running base
services in Docker.
---
 .github/workflows/test.yml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2cbb0f3e..836c7817 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,22 +45,30 @@ jobs:
       - name: Initialize chain
         run: ./stack compose-init
 
-      - name: Run stack
-        env:
-          DISABLE_TELEMETRY: true
-          API_HOST: ""
-        run: ./stack compose-up -d
-
-      - name: Run tests
-        env:
-          LOG_LEVEL: debug
-        run: ./stack integration-tests
+      - name: Start base services
+        run: ./stack compose-services -d
 
-      - name: Display resource provider logs
-        run: docker logs resource-provider
+      - name: Start solver
+        run: |
+          ./stack solver --disable-telemetry=true --api-host="" > solver.log &
+          sleep 5
+
+      - name: Run solver integration tests
+        run: ./stack integration-tests-solver
+
+      - name: Start resource provider
+        run: |
+          ./stack resource-provider --disable-telemetry=true --api-host="" > resource-provider.log &
+          sleep 5
+
+      - name: Run main integration tests
+        run: ./stack integration-tests
 
       - name: Display solver logs
-        run: docker logs solver
+        run: cat solver.log
+
+      - name: Display resource provider logs
+        run: cat resource-provider.log
 
       - name: Display chain logs
         run: docker logs chain