From 9a32ccbed0f693414410abaaa575dabfdaaa9d4f Mon Sep 17 00:00:00 2001
From: Roberto Scolaro <roberto.scolaro21@gmail.com>
Date: Tue, 6 Feb 2024 17:42:09 +0000
Subject: [PATCH] fix(ci): don't fail fast on libsinsp_e2e

Signed-off-by: Roberto Scolaro <roberto.scolaro21@gmail.com>
---
 .github/workflows/e2e_ci.yml | 42 ++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/e2e_ci.yml b/.github/workflows/e2e_ci.yml
index fee44491c60..19cb3eaf4d6 100644
--- a/.github/workflows/e2e_ci.yml
+++ b/.github/workflows/e2e_ci.yml
@@ -21,6 +21,13 @@ jobs:
     strategy:
       matrix:
         arch: [amd64, arm64]
+        include:
+          - name: kmod
+            option: -k
+          - name: bpf
+            option: -b
+          - name: modern-bpf
+            option: -m
       fail-fast: false
     steps:
       - name: Checkout Libs ⤵️
@@ -55,20 +62,10 @@ jobs:
           cd build && cmake -DUSE_BUNDLED_DEPS=ON -DENABLE_LIBSINSP_TESTS=ON -DBUILD_LIBSCAP_MODERN_BPF=ON -DBUILD_BPF=ON -DBUILD_LIBSCAP_GVISOR=OFF ../
           make -j6
 
-      - name: Run e2e tests with modern bpf 🏎️
+      - name: Run e2e tests with ${{ matrix.name }} 🏎️
         run: |
           cd build/test/libsinsp/
-          sudo ./tests -m
-
-      - name: Run e2e tests with bpf 🏎️
-        run: |
-          cd build/test/libsinsp/
-          sudo ./tests -b
-
-      - name: Run e2e tests with kmod 🏎️
-        run: |
-          cd build/test/libsinsp/
-          sudo ./tests -k
+          sudo ./libsinsp_e2e_tests ${{ matrix.option }}
 
   build-drivers-s390x-ppc64le:
     name: build-drivers-${{ matrix.arch }} 😁 (system_deps)
@@ -76,6 +73,13 @@ jobs:
     strategy:
       matrix:
         arch: [s390x, ppc64le]
+        include:
+          - name: kmod
+            option: -k
+          - name: bpf
+            option: -b
+          - name: modern-bpf
+            option: -m
       fail-fast: false
     env:
       PLATFORM: ${{ matrix.arch == 'ppc64le' && 'powerpc64le' || 's390x' }}
@@ -110,17 +114,7 @@ jobs:
             cd build && cmake -DBUILD_BPF=ON -DUSE_BUNDLED_DEPS=OFF -DMODERN_PROBE_INCLUDE="-I/usr/include/${{env.PLATFORM}}-linux-gnu" -DBUILD_LIBSCAP_MODERN_BPF=ON -DENABLE_LIBSINSP_TESTS=ON -DBUILD_LIBSCAP_GVISOR=OFF ../
             KERNELDIR=/lib/modules/$(ls /lib/modules)/build make -j6
 
-      - name: Run e2e tests with modern bpf 🏎️
-        run: |
-          cd build/test/libsinsp/
-          sudo ./tests -m
-
-      - name: Run e2e tests with bpf 🏎️
-        run: |
-          cd build/test/libsinsp/
-          sudo ./tests -b
-
-      - name: Run e2e tests with kmod 🏎️
+      - name: Run e2e tests with ${{ matrix.name }} 🏎️
         run: |
           cd build/test/libsinsp/
-          sudo ./tests -k
+          sudo ./libsinsp_e2e_tests ${{ matrix.option }}