From c42670b5229e11926aae7082cc410a4a493e0ec6 Mon Sep 17 00:00:00 2001
From: pvannierop <pim@thehyve.nl>
Date: Wed, 16 Oct 2024 11:24:26 +0200
Subject: [PATCH] Update GitHub actions to master

---
 .github/workflows/main.yml        | 11 +++++++++++
 .github/workflows/pre-release.yml | 10 +++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1730f1acf..b74b39e39 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,6 +72,7 @@ jobs:
           cp src/test/resources/config/keystore.p12 src/main/resources/config/keystore.p12
           ./gradlew bootRun &>mp.log </dev/null &
           yarn run wait-for-managementportal
+          ./gradlew generateOpenApiSpec
           yarn e2e
           ./gradlew --stop
 
@@ -202,6 +203,16 @@ jobs:
             org.opencontainers.image.vendor=RADAR-base
             org.opencontainers.image.licenses=Apache-2.0
 
+#      # placeholder for testing
+#      - name: End to end tests (docker image)
+#        id: e2e-prod-docker
+#        run: |
+#          cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
+#          ./gradlew -Pprod buildDocker -x test -x javadocJar
+#          docker-compose -f src/main/docker/app.yml up -d
+#          yarn run e2e-prod
+#          docker-compose -f src/main/docker/app.yml down -v
+
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252
       # https://github.com/moby/buildkit/issues/1896
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index 3efa72be0..00ac52e70 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -59,14 +59,14 @@ jobs:
       - name: Compile java
         run: ./gradlew assemble
 
-      - name: End to end tests
+      - name: Run full production end to end tests
         id: e2e
         run: |
           cp src/test/resources/config/keystore.p12 src/main/resources/config/keystore.p12
-          ./gradlew bootRun &>mp.log </dev/null &
-          yarn run wait-for-managementportal
-          ./gradlew generateOpenApiSpec
-          yarn e2e
+          docker-compose -f src/main/docker/postgresql.yml up -d
+          ./gradlew bootRun -Pprod -Pe2e-prod-test &>mp.log </dev/null &
+          yarn run e2e-prod
+          docker-compose -f src/main/docker/postgresql.yml down -v
           ./gradlew --stop
 
       - name: Upload screenshots of failed e2e tests