From 71bfa8be499961e02a034b2109aef9ddb616ac4c Mon Sep 17 00:00:00 2001
From: Paul Latzelsperger <paul.latzelsperger@beardyinc.com>
Date: Mon, 10 Jul 2023 19:05:03 +0200
Subject: [PATCH] fix ci

---
 .github/workflows/verify.yaml                 | 25 ++++++++++++++++---
 .../docker-environment/docker-compose.yaml    |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index d0e18f724..365daa2e7 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -199,7 +199,26 @@ jobs:
       - uses: actions/checkout@v2
       - name: Starting MIW, Keycloak and Postgres Servers
         run: |
-          cd edc-tests/e2e-tests/src/test/resources/docker-environment
+          docker compose -f edc-tests/e2e-tests/src/test/resources/docker-compose.yml up --wait
+
+      - name: Run MIW E2E tests
+        run: |
+          pwd
+          ./gradlew -p edc-tests/e2e-tests test -DincludeTags="MiwIntegrationTest"
+
+  miw-integration-tests:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    needs: [ verify-formatting, verify-license-headers ]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-java
+
+      - uses: actions/checkout@v2
+      - name: Starting MIW, Keycloak and Postgres Servers
+        run: |
+          cd edc-tests/miw-tests/src/test/resources/docker-environment
           docker compose up --wait
 
       - uses: nick-fields/retry@v2
@@ -216,9 +235,9 @@ jobs:
 
       - name: Seed test data
         run: |
-          docker exec -i docker-environment-keycloak-1 /opt/seed.sh
+          docker exec docker-environment-postgres-1 /opt/seed.sh
 
       - name: Run MIW E2E tests
         run: | 
           pwd
-          ./gradlew test -DincludeTags="MiwIntegrationTest"
\ No newline at end of file
+          ./gradlew -p edc-tests/miw-tests test -DincludeTags="MiwIntegrationTest"
\ No newline at end of file
diff --git a/edc-tests/miw-tests/src/test/resources/docker-environment/docker-compose.yaml b/edc-tests/miw-tests/src/test/resources/docker-environment/docker-compose.yaml
index dc1953637..7718336a0 100644
--- a/edc-tests/miw-tests/src/test/resources/docker-environment/docker-compose.yaml
+++ b/edc-tests/miw-tests/src/test/resources/docker-environment/docker-compose.yaml
@@ -44,7 +44,7 @@ services:
   postgres:
     image: postgres:15.3-alpine3.18
     volumes:
-      - ./postgres_data:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
       - ./postgres/db.sh:/docker-entrypoint-initdb.d/init-database.sh
       - ./postgres/seed.sh:/opt/seed.sh
     env_file: