From f77369595cb2fc3ccd4cbd6629a6374e2e4f2854 Mon Sep 17 00:00:00 2001
From: Gerrit91 <info@gerritschwerthelm.de>
Date: Mon, 29 Apr 2024 10:54:41 +0200
Subject: [PATCH] Try running both mini-lab flavors.

---
 .github/workflows/integration.yaml | 14 ++++++++++++--
 test/integration/ci-prep.sh        |  1 -
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 33c89c84..b86308cc 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -16,6 +16,15 @@ jobs:
   test:
     name: Integration tests
     runs-on: self-hosted
+
+    strategy:
+      matrix:
+        flavors:
+          - name: sonic
+            env: MINI_LAB_FLAVOR=sonic
+          - name: cumulus
+            env: MINI_LAB_FLAVOR=cumulus
+
     steps:
     - name: Gain back workspace permissions # https://github.com/actions/checkout/issues/211
       run: |
@@ -40,6 +49,7 @@ jobs:
       uses: EnricoMi/publish-unit-test-result-action@v2
       with:
         files: test/integration/**/output/*.xml
+      if: ${{ matrix.flavors.name == 'sonic' }}
 
     - name: Slack Notification on Success
       uses: rtCamp/action-slack-notify@v2
@@ -48,11 +58,11 @@ jobs:
       env:
         SLACK_COLOR: good
         SLACK_TITLE: 'Integration Tests succeeded'
-      if: ${{ success() }}
+      if: ${{ matrix.flavors.name == 'sonic' && success() }}
 
     - name: Slack Notification on Failure
       uses: rtCamp/action-slack-notify@v2
       env:
         SLACK_COLOR: red
         SLACK_TITLE: 'Integration Tests failed'
-      if: ${{ failure() }}
+      if: ${{ matrix.flavors.name == 'sonic' && failure() }}
diff --git a/test/integration/ci-prep.sh b/test/integration/ci-prep.sh
index e119166e..b9e338bf 100755
--- a/test/integration/ci-prep.sh
+++ b/test/integration/ci-prep.sh
@@ -27,7 +27,6 @@ cd "${MINI_LAB_PATH}"
 git checkout "${MINI_LAB_VERSION}"
 
 # self hosted runners get dirty, we need to clean up first
-make cleanup
 ./test/ci-cleanup.sh
 
 cd -