From 5187bd7964d15d073c90199a14a382509d1d2089 Mon Sep 17 00:00:00 2001
From: Fabio Burzigotti <fburzigo@redhat.com>
Date: Mon, 23 Sep 2024 15:40:11 +0200
Subject: [PATCH] [issues-1313] - Use GitHub actions for integration tests

---
 .github/workflows/maven.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index dff1599b0..e1af55715 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -11,8 +11,6 @@ on:
       - 'doc/**'
       - '.circleci/**'
 env:
-  # failsafe.groups configuration depends on the env setup.
-  FAILSAFE_GROUPS: ''
   DOCKER_HOST: 'unix:///var/run/docker.sock'
 
 jobs:
@@ -23,6 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         java: ['11']
+        job:
+        - [variant: 'docker', failsafe-groups: 'org.arquillian.cube.docker.impl.requirement.RequiresDocker']
+        - [variant: 'kubernetes', failsafe-groups: 'org.arquillian.cube.kubernetes.impl.requirement.RequiresKubernetes']
 
     steps:
       - name: Setup Minikube
@@ -34,8 +35,6 @@ jobs:
           kubernetes version: 'v1.30.0'
           github token: ${{ secrets.GITHUB_TOKEN }}
           start args: "--memory='4gb' --cpus='2'"
-        env:
-          FAILSAFE_GROUPS: "-Dfailsafe.groups=\"org.arquillian.cube.docker.impl.requirement.RequiresDocker,org.arquillian.cube.kubernetes.impl.requirement.RequiresKubernetes\""
       - name: Enable minikube registry
         run: |
           minikube addons enable registry
@@ -58,7 +57,7 @@ jobs:
           ./mvnw verify -q -U -DskipTests # pre-fetch dependencies
       - name: Build with Maven Java ${{ matrix.java }}
         run: |
-          ./mvnw -fae clean package ${{ env.FAILSAFE_GROUPS }}
+          ./mvnw -fae clean package ${{ matrix.job.failsafe-groups }}
       - uses: actions/upload-artifact@v3
         if: failure()
         with: