From 80203df3f1a28cce4bc486bd6ba32b1519822f20 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <rohaan@redhat.com>
Date: Sat, 10 Feb 2024 12:40:37 +0530
Subject: [PATCH] ci : E2E tests should also run on GitHub MacOS runners

+ Enable E2E tests to run on GitHub MacOS runners
+ Use `crazy-max/ghaction-setup-docker` action to set up docker on MacOS

Signed-off-by: Rohan Kumar <rohaan@redhat.com>
---
 .github/workflows/e2e-tests.yml | 42 +++++++++++++++++++++++++++++++--
 it/multi-assembly/pom.xml       |  1 +
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 354b52873..82c1dea00 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -36,14 +36,14 @@ jobs:
       - name: Install DMP
         run: mvn ${MAVEN_ARGS} clean install -DskipTests -Djacoco.skip=true
 
-  build:
+  linux-build:
     name: Docker ${{ matrix.docker }} on Linux
     runs-on: ubuntu-latest
     needs: buildWithoutTests
     strategy:
       fail-fast: false
       matrix:
-        docker: [v25.0.2, v24.0.9, v23.0.6]
+        docker: [v25.0.2, v24.0.9, v23.0.6, v20.10.24]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -60,7 +60,45 @@ jobs:
         uses: crazy-max/ghaction-setup-docker@v2
         with:
           version: ${{ matrix.docker }}
+        run: |
+         # Workaround for https://github.com/docker/for-linux/issues/748
+          DOCKER_INSTALL_PATH=`which docker`
+          sudo cp $DOCKER_INSTALL_PATH-init /sbin/docker-init
+      - name: Run Integration tests
+        run: |
+          cd it/
+          mvn clean install
+  macos-build:
+    name: MacOS
+    needs: buildWithoutTests
+    runs-on: macos-13
+    strategy:
+      fail-fast: false
+      matrix:
+        docker: [v25.0.2,v24.0.9,v23.0.6,v20.10.24]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+      - name: Cache .m2 registry
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
+      - name: Set up Docker
+        uses: crazy-max/ghaction-setup-docker@v2
+        with:
+          version: ${{ matrix.docker }}
+      - name: Set up Docker Buildx
+        run: |
+          brew install docker-buildx
+          mkdir -p ~/.docker/cli-plugins
+          ln -sfn /usr/local/opt/docker-buildx/bin/docker-buildx ~/.docker/cli-plugins/docker-buildx
       - name: Run Integration tests
         run: |
+          export DOCKER_HOST=unix:///Users/runner/.colima/default/docker.sock
           cd it/
           mvn clean install
diff --git a/it/multi-assembly/pom.xml b/it/multi-assembly/pom.xml
index 92518c624..f908fc114 100644
--- a/it/multi-assembly/pom.xml
+++ b/it/multi-assembly/pom.xml
@@ -97,6 +97,7 @@
               <run>
                 <wait>
                   <log>Hello from Spring Boot!</log>
+                  <time>30000</time>
                 </wait>
               </run>
             </image>