ci: Split build and run steps e2e

Author: philipgough

.github/workflows/ci.yml

@@ -61,7 +61,7 @@ jobs:
 
   test-e2e:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
 
@@ -76,8 +76,34 @@ jobs:
       - name: Install system dependencies
         run: sudo apt-get update && sudo apt-get install -y make
 
+      - name: Build e2e test container
+        run: |
+          echo "Building e2e test container..."
+          OCI_BIN=docker make container-test
+          echo "Available Docker images:"
+          docker images | grep observatorium || echo "No observatorium images found"
+          echo "Saving container image to cache..."
+          docker save quay.io/observatorium/api:local_e2e_test > /tmp/e2e-image.tar
+
+      - name: Load e2e test container
+        run: |
+          echo "Loading e2e test container..."
+          docker load < /tmp/e2e-image.tar
+          echo "Verifying image is loaded:"
+          docker images | grep observatorium
+
       - name: End-to-end tests
-        run: OCI_BIN=docker make test-e2e
+        run: |
+          echo "Running e2e tests..."
+          rm -rf test/e2e/e2e_*
+          OCI_BIN=docker CGO_ENABLED=1 GO111MODULE=on go test -timeout=25m -race -short -tags integration ./test/e2e 2>&1 | tee test_output.log
+          exit_code=${PIPESTATUS[0]}
+          if [ $exit_code -ne 0 ]; then
+            echo "Tests failed with exit code: $exit_code"
+            echo "Last 50 lines of output:"
+            tail -50 test_output.log
+          fi
+          exit $exit_code
 
   generate:
     runs-on: ubuntu-latest