From 769a2502157f3d7cb27cff54f9c9141db29daf73 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <rohaan@redhat.com>
Date: Fri, 22 Nov 2024 19:44:35 +0530
Subject: [PATCH] ci : fix failing sonar and E2E macOS github action workflows

+ Add same version of sonar-maven-plugin as used in jkube
+ Use v3 version of setup-docker github action in e2e macOS pipelines,
  add workaround for failing jobs in QEMU 9.1.0

Signed-off-by: Rohan Kumar <rohaan@redhat.com>
---
 .github/workflows/e2e-tests.yml | 9 ++++++---
 pom.xml                         | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index daf9cd926..6853883c7 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -57,7 +57,7 @@ jobs:
           path: ~/.m2/repository
           key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
       - name: Set up Docker
-        uses: crazy-max/ghaction-setup-docker@v2
+        uses: crazy-max/ghaction-setup-docker@v3
         with:
           version: ${{ matrix.docker }}
       - name: Run Integration tests
@@ -87,8 +87,11 @@ jobs:
         with:
           path: ~/.m2/repository
           key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
+      - # https://github.com/crazy-max/ghaction-setup-docker/issues/108
+        name: Install QEMU 9.0.2
+        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       - name: Set up Docker
-        uses: crazy-max/ghaction-setup-docker@v2
+        uses: crazy-max/ghaction-setup-docker@v3
         with:
           version: ${{ matrix.docker }}
       - name: Set up Docker Buildx
@@ -98,6 +101,6 @@ jobs:
           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
+          export DOCKER_HOST=unix:///Users/runner/.lima/docker-actions-toolkit/docker.sock
           cd it/
           mvn clean install
diff --git a/pom.xml b/pom.xml
index e264280db..fdc151e59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
     <surefire.version>3.0.0-M2</surefire.version>
     <system-stubs.version>2.0.1</system-stubs.version>
     <version.assertj-core>3.25.3</version.assertj-core>
+    <version.sonar-maven-plugin>3.11.0.3922</version.sonar-maven-plugin>
   </properties>
 
   <dependencies>
@@ -733,6 +734,7 @@
           <plugin>
             <groupId>org.sonarsource.scanner.maven</groupId>
             <artifactId>sonar-maven-plugin</artifactId>
+            <version>${version.sonar-maven-plugin}</version>
             <executions>
               <execution>
                 <id>sonar</id>